summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-04-28 13:51:22 +0200
committerHowaner <franzi.moos@googlemail.com>2014-04-28 13:51:22 +0200
commit26e935cb2028e041623424d474ccf1b127d55e97 (patch)
treec9d67cb8336f9d47b643fc1ee7c4d3248a8d15f4
parentChanged the old invulnerable methods from the wither to the new. (diff)
downloadcuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar.gz
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar.bz2
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar.lz
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar.xz
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.tar.zst
cuberite-26e935cb2028e041623424d474ccf1b127d55e97.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Wither.h3
-rw-r--r--src/Protocol/Protocol125.cpp9
-rw-r--r--src/Protocol/Protocol17x.cpp9
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp9
-rw-r--r--src/WorldStorage/WSSAnvil.cpp2
5 files changed, 4 insertions, 28 deletions
diff --git a/src/Mobs/Wither.h b/src/Mobs/Wither.h
index fbea331d3..81c9df1b1 100644
--- a/src/Mobs/Wither.h
+++ b/src/Mobs/Wither.h
@@ -19,9 +19,6 @@ public:
/** Returns whether the wither is invulnerable to arrows. */
bool IsArmored(void) const;
-
- /** Use the wither the invulnerable from the spawn? */
- bool IsSpawnInvulnerable(void) const { return m_IsSpawnInvulnerable; }
// cEntity overrides
virtual bool Initialize(cWorld * a_World) override;
diff --git a/src/Protocol/Protocol125.cpp b/src/Protocol/Protocol125.cpp
index 3951eb3e4..a23afb29a 100644
--- a/src/Protocol/Protocol125.cpp
+++ b/src/Protocol/Protocol125.cpp
@@ -2013,14 +2013,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtWither:
{
WriteByte(0x54); // Int at index 20
- if (((const cWither &)a_Mob).IsSpawnInvulnerable())
- {
- WriteInt((Int32)((const cWither &)a_Mob).GetInvulnerableTicks());
- }
- else
- {
- WriteInt((Int32)0);
- }
+ WriteInt((Int32)((const cWither &)a_Mob).GetWitherInvulnerableTicks());
WriteByte(0x66); // Float at index 6
WriteFloat((float)(a_Mob.GetHealth()));
break;
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 311e770f9..80b161e3e 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -2820,14 +2820,7 @@ void cProtocol172::cPacketizer::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtWither:
{
WriteByte(0x54); // Int at index 20
- if (((const cWither &)a_Mob).IsSpawnInvulnerable())
- {
- WriteInt(((const cWither &)a_Mob).GetInvulnerableTicks());
- }
- else
- {
- WriteInt(0);
- }
+ WriteInt(((const cWither &)a_Mob).GetWitherInvulnerableTicks());
WriteByte(0x66); // Float at index 6
WriteFloat((float)(a_Mob.GetHealth()));
break;
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 0c4a1a430..46c6b8e92 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -516,14 +516,7 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
}
case cMonster::mtWither:
{
- if (((const cWither *)a_Monster)->IsSpawnInvulnerable())
- {
- m_Writer.AddInt("Invul", ((const cWither *)a_Monster)->GetInvulnerableTicks());
- }
- else
- {
- m_Writer.AddInt("Invul", 0);
- }
+ m_Writer.AddInt("Invul", ((const cWither *)a_Monster)->GetWitherInvulnerableTicks());
break;
}
case cMonster::mtWolf:
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index c21809270..4532a925a 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -2272,7 +2272,7 @@ void cWSSAnvil::LoadWitherFromNBT(cEntityList & a_Entities, const cParsedNBT & a
int CurrLine = a_NBT.FindChildByName(a_TagIdx, "Invul");
if (CurrLine > 0)
{
- Monster->SetInvulnerableTicks(a_NBT.GetInt(CurrLine));
+ Monster->SetWitherInvulnerableTicks(a_NBT.GetInt(CurrLine));
}
a_Entities.push_back(Monster.release());