summaryrefslogtreecommitdiffstats
path: root/src/Protocol
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 /src/Protocol
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 'src/Protocol')
-rw-r--r--src/Protocol/Protocol125.cpp9
-rw-r--r--src/Protocol/Protocol17x.cpp9
2 files changed, 2 insertions, 16 deletions
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;