diff options
| author | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-04-28 22:05:02 +0200 |
| commit | 0b16e6821ff475dca0539426ec403241170ce93d (patch) | |
| tree | e272cae036cd9117e1d1f4cea3555c0c0d3aa748 /src/WorldStorage/WSSAnvil.cpp | |
| parent | Added the G1 root cert. (diff) | |
| parent | Merge pull request #940 from Howaner/GlobalFixes (diff) | |
| download | cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.gz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.bz2 cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.lz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.xz cuberite-0b16e6821ff475dca0539426ec403241170ce93d.tar.zst cuberite-0b16e6821ff475dca0539426ec403241170ce93d.zip | |
Diffstat (limited to 'src/WorldStorage/WSSAnvil.cpp')
| -rw-r--r-- | src/WorldStorage/WSSAnvil.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 48934d074..33f34728e 100644 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -27,7 +27,6 @@ #include "../BlockEntities/MobHeadEntity.h" #include "../BlockEntities/FlowerPotEntity.h" - #include "../Mobs/Monster.h" #include "../Mobs/IncludeAllMonsters.h" @@ -36,7 +35,12 @@ #include "../Entities/FallingBlock.h" #include "../Entities/Minecart.h" #include "../Entities/Pickup.h" -#include "../Entities/ProjectileEntity.h" +#include "../Entities/ArrowEntity.h" +#include "../Entities/ThrownEggEntity.h" +#include "../Entities/ThrownEnderPearlEntity.h" +#include "../Entities/ThrownSnowballEntity.h" +#include "../Entities/FireChargeEntity.h" +#include "../Entities/GhastFireballEntity.h" #include "../Entities/TNTEntity.h" #include "../Entities/ExpOrb.h" #include "../Entities/HangingEntity.h" @@ -1757,7 +1761,7 @@ void cWSSAnvil::LoadBlazeFromNBT(cEntityList & a_Entities, const cParsedNBT & a_ void cWSSAnvil::LoadCaveSpiderFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx) { - std::auto_ptr<cCavespider> Monster(new cCavespider()); + std::auto_ptr<cCaveSpider> Monster(new cCaveSpider()); if (!LoadEntityBaseFromNBT(*Monster.get(), a_NBT, a_TagIdx)) { return; @@ -2272,7 +2276,7 @@ void cWSSAnvil::LoadWitherFromNBT(cEntityList & a_Entities, const cParsedNBT & a int CurrLine = a_NBT.FindChildByName(a_TagIdx, "Invul"); if (CurrLine > 0) { - Monster->SetNumInvulnerableTicks(a_NBT.GetInt(CurrLine)); + Monster->SetWitherInvulnerableTicks(a_NBT.GetInt(CurrLine)); } a_Entities.push_back(Monster.release()); |