diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-08-29 14:44:01 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-08-29 14:44:01 +0200 |
| commit | 114b14faad854661040a3a65c027d6b3fa818f56 (patch) | |
| tree | 160f10220998974efe41ce18aa191405c1030e37 | |
| parent | Improved command block security (diff) | |
| download | cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar.gz cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar.bz2 cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar.lz cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar.xz cuberite-114b14faad854661040a3a65c027d6b3fa818f56.tar.zst cuberite-114b14faad854661040a3a65c027d6b3fa818f56.zip | |
| -rw-r--r-- | src/Entities/ItemFrame.cpp | 1 | ||||
| -rw-r--r-- | src/Items/ItemHandler.h | 2 | ||||
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp index f0b0c8c65..0bc10ec60 100644 --- a/src/Entities/ItemFrame.cpp +++ b/src/Entities/ItemFrame.cpp @@ -55,7 +55,6 @@ void cItemFrame::KilledBy(TakeDamageInfo & a_TDI) { if (m_Item.IsEmpty()) { - SetHealth(0); super::KilledBy(a_TDI); Destroy(); return; diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index 8b554ee34..67c250a97 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -75,7 +75,7 @@ public: int FoodLevel; double Saturation; - FoodInfo(int a_FoodLevel, double a_Saturation, int a_PoisonChance = 0) : + FoodInfo(int a_FoodLevel, double a_Saturation) : FoodLevel(a_FoodLevel), Saturation(a_Saturation) { diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index e435a1b1f..68e541eba 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -615,7 +615,6 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile) { m_Writer.BeginCompound(""); AddBasicEntity(a_Projectile, a_Projectile->GetMCAClassName()); - Vector3d Pos = a_Projectile->GetPosition(); m_Writer.AddByte("inGround", a_Projectile->IsInGround() ? 1 : 0); switch (a_Projectile->GetProjectileKind()) |