diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-04-28 13:51:22 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-04-28 13:51:22 +0200 |
| commit | 26e935cb2028e041623424d474ccf1b127d55e97 (patch) | |
| tree | c9d67cb8336f9d47b643fc1ee7c4d3248a8d15f4 /src/WorldStorage | |
| parent | Changed the old invulnerable methods from the wither to the new. (diff) | |
| download | cuberite-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/WorldStorage')
| -rw-r--r-- | src/WorldStorage/NBTChunkSerializer.cpp | 9 | ||||
| -rw-r--r-- | src/WorldStorage/WSSAnvil.cpp | 2 |
2 files changed, 2 insertions, 9 deletions
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()); |