diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-26 22:23:36 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-26 22:23:36 +0200 |
| commit | af997a09ca1ff2bf3e93f9145edc50d29be28529 (patch) | |
| tree | 8188753488f633407eea5aab0c9e6e0833300e43 /src/BlockEntities/DispenserEntity.cpp | |
| parent | Fixed players custom name in 1.8 (diff) | |
| parent | Merge pull request #1455 from mc-server/includes (diff) | |
| download | cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.gz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.bz2 cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.lz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.xz cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.tar.zst cuberite-af997a09ca1ff2bf3e93f9145edc50d29be28529.zip | |
Diffstat (limited to 'src/BlockEntities/DispenserEntity.cpp')
| -rw-r--r-- | src/BlockEntities/DispenserEntity.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp index f8830bf25..4794375cf 100644 --- a/src/BlockEntities/DispenserEntity.cpp +++ b/src/BlockEntities/DispenserEntity.cpp @@ -2,13 +2,10 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "DispenserEntity.h" -#include "../Entities/Player.h" #include "../Simulator/FluidSimulator.h" #include "../Chunk.h" #include "../World.h" -#include "../Entities/ArrowEntity.h" -#include "../Entities/FireChargeEntity.h" #include "../Entities/ProjectileEntity.h" @@ -109,7 +106,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) { double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width); double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width); - if (m_World->SpawnMob(MobX, DispY, MobZ, (cMonster::eType)m_Contents.GetSlot(a_SlotNum).m_ItemDamage) >= 0) + if (m_World->SpawnMob(MobX, DispY, MobZ, (eMonsterType)m_Contents.GetSlot(a_SlotNum).m_ItemDamage) >= 0) { m_Contents.ChangeSlotCount(a_SlotNum, -1); } |