diff options
| author | TheHyper45 <dawid.priv@o2.pl> | 2021-06-20 10:39:52 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2022-04-12 01:06:40 +0200 |
| commit | ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851 (patch) | |
| tree | a02ac39ce081a560d70e728ab3d4e7b4038d296b /src/Entities/Entity.cpp | |
| parent | add hle0 to CONTRIBUTORS (diff) | |
| download | cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar.gz cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar.bz2 cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar.lz cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar.xz cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.tar.zst cuberite-ca9d0aa4e2c1b6dfd914f77a9cde349ee62a9851.zip | |
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 |