diff options
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index b6a67859b..c4f61ad1e 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -16,6 +16,7 @@ #include "../FastRandom.h" #include "../NetherPortalScanner.h" #include "../BoundingBox.h" +#include "../WorldStorage/NamespaceSerializer.h" @@ -2364,16 +2365,7 @@ void cEntity::BroadcastDeathMessage(TakeDamageInfo & a_TDI) } else { - // Tamed ocelots are really cats in vanilla. - if (Monster->IsTame() && (Monster->GetClass() == AString("cOcelot"))) - { - Name = "Cat"; - } - else - { - Name = Monster->GetClass(); - Name.erase(Name.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch") - } + Name = AString(NamespaceSerializer::Prettify(Monster->GetMobType(), Monster->IsTame())); } } else |