summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/MobSpawnerEntity.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-29 15:20:44 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-29 15:20:44 +0100
commit2478e290f9f7f6a74bba4ac885cfaef6327bc9ee (patch)
tree54d9f9d97e3a1ed850f63292e002938e3d8d3ff0 /src/BlockEntities/MobSpawnerEntity.cpp
parentMerge branch 'master' into MobSpawner (diff)
downloadcuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar.gz
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar.bz2
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar.lz
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar.xz
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.tar.zst
cuberite-2478e290f9f7f6a74bba4ac885cfaef6327bc9ee.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/MobSpawnerEntity.cpp47
1 files changed, 1 insertions, 46 deletions
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 696a109d1..26499972d 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -49,7 +49,7 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
{
a_Player->GetInventory().RemoveOneEquippedItem();
}
- LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), GetEntityName().c_str());
+ LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), cMonster::MobTypeToString(MonsterType).c_str());
}
}
@@ -195,51 +195,6 @@ void cMobSpawnerEntity::SpawnEntity(void)
-AString cMobSpawnerEntity::GetEntityName() const
-{
- switch (m_Entity)
- {
- case mtBat: return "Bat";
- case mtBlaze: return "Blaze";
- case mtCaveSpider: return "CaveSpider";
- case mtChicken: return "Chicken";
- case mtCow: return "Cow";
- case mtCreeper: return "Creeper";
- case mtEnderDragon: return "EnderDragon";
- case mtEnderman: return "Enderman";
- case mtGhast: return "Ghast";
- case mtGiant: return "Giant";
- case mtHorse: return "EntityHorse";
- case mtIronGolem: return "VillagerGolem";
- case mtMagmaCube: return "LavaSlime";
- case mtMooshroom: return "MushroomCow";
- case mtOcelot: return "Ozelot";
- case mtPig: return "Pig";
- case mtSheep: return "Sheep";
- case mtSilverfish: return "Silverfish";
- case mtSkeleton: return "Skeleton";
- case mtSlime: return "Slime";
- case mtSnowGolem: return "SnowMan";
- case mtSpider: return "Spider";
- case mtSquid: return "Squid";
- case mtVillager: return "Villager";
- case mtWitch: return "Witch";
- case mtWither: return "WitherBoss";
- case mtWolf: return "Wolf";
- case mtZombie: return "Zombie";
- case mtZombiePigman: return "PigZombie";
- default:
- {
- ASSERT(!"Unknown monster type!");
- return "Pig";
- }
- }
-}
-
-
-
-
-
int cMobSpawnerEntity::GetNearbyPlayersNum(void)
{
Vector3d SpawnerPos(m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);