diff options
| author | NiLSPACE <NiLSPACE@users.noreply.github.com> | 2021-03-11 22:26:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 22:26:35 +0100 |
| commit | c729d7abde7773df1bd88ce8d2c064ec5a3ae77f (patch) | |
| tree | 9d4ce3445940637cf4eee3debedc4b52e5e0be31 /src/Entities | |
| parent | Do protocol decryption in-place (with CryptoAPI on Windows) (#5145) (diff) | |
| download | cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar.gz cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar.bz2 cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar.lz cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar.xz cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.tar.zst cuberite-c729d7abde7773df1bd88ce8d2c064ec5a3ae77f.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index e3994e88c..b7ffbc9e4 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -809,7 +809,7 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) SaveToDisk(); // Save it, yeah the world is a tough place ! cPluginManager * PluginManager = cRoot::Get()->GetPluginManager(); - if ((a_TDI.Attacker == nullptr) && m_World->ShouldBroadcastDeathMessages()) + if (a_TDI.Attacker == nullptr) { const AString DamageText = [&] { @@ -845,10 +845,6 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) GetWorld()->BroadcastChatDeath(DeathMessage); } } - else if (a_TDI.Attacker == nullptr) // && !m_World->ShouldBroadcastDeathMessages() by fallthrough - { - // no-op - } else if (a_TDI.Attacker->IsPlayer()) { cPlayer * Killer = static_cast<cPlayer *>(a_TDI.Attacker); |