diff options
Diffstat (limited to 'src/Entities/Player.cpp')
-rw-r--r-- | src/Entities/Player.cpp | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 235433cf8..fcdbcf64c 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -863,65 +863,8 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) m_World->SpawnItemPickups(Pickups, GetPosX(), GetPosY(), GetPosZ(), 10); SaveToDisk(); // Save it, yeah the world is a tough place ! - cPluginManager * PluginManager = cRoot::Get()->GetPluginManager(); - if (a_TDI.Attacker == nullptr) - { - const AString DamageText = [&] - { - switch (a_TDI.DamageType) - { - case dtRangedAttack: return "was shot"; - case dtLightning: return "was plasmified by lightining"; - case dtFalling: return GetRandomProvider().RandBool() ? "fell to death" : "hit the ground too hard"; - case dtDrowning: return "drowned"; - case dtSuffocating: return GetRandomProvider().RandBool() ? "git merge'd into a block" : "fused with a block"; - case dtStarving: return "forgot the importance of food"; - case dtCactusContact: return "was impaled on a cactus"; - case dtMagmaContact: return "discovered the floor was lava"; - case dtLavaContact: return "was melted by lava"; - case dtPoisoning: return "died from septicaemia"; - case dtWithering: return "is a husk of their former selves"; - case dtOnFire: return "forgot to stop, drop, and roll"; - case dtFireContact: return "burnt themselves to death"; - case dtInVoid: return "somehow fell out of the world"; - case dtPotionOfHarming: return "was magicked to death"; - case dtEnderPearl: return "misused an ender pearl"; - case dtAdmin: return "was administrator'd"; - case dtExplosion: return "blew up"; - case dtAttack: return "was attacked by thin air"; - case dtEnvironment: return "played too much dress up"; // This is not vanilla - added a own pun - } - UNREACHABLE("Unsupported damage type"); - }(); - AString DeathMessage = Printf("%s %s", GetName().c_str(), DamageText.c_str()); - PluginManager->CallHookKilled(*this, a_TDI, DeathMessage); - if (DeathMessage != AString("")) - { - GetWorld()->BroadcastChatDeath(DeathMessage); - } - } - else if (a_TDI.Attacker->IsPlayer()) - { - cPlayer * Killer = static_cast<cPlayer *>(a_TDI.Attacker); - AString DeathMessage = Printf("%s was killed by %s", GetName().c_str(), Killer->GetName().c_str()); - PluginManager->CallHookKilled(*this, a_TDI, DeathMessage); - if (DeathMessage != AString("")) - { - GetWorld()->BroadcastChatDeath(DeathMessage); - } - } - else - { - AString KillerClass = a_TDI.Attacker->GetClass(); - KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch") - AString DeathMessage = Printf("%s was killed by a %s", GetName().c_str(), KillerClass.c_str()); - PluginManager->CallHookKilled(*this, a_TDI, DeathMessage); - if (DeathMessage != AString("")) - { - GetWorld()->BroadcastChatDeath(DeathMessage); - } - } + BroadcastDeathMessage(a_TDI); m_Stats.Custom[CustomStatistic::Deaths]++; m_Stats.Custom[CustomStatistic::TimeSinceDeath] = 0; |