diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-08-10 21:47:16 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-08-10 21:47:16 +0200 |
| commit | 63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b (patch) | |
| tree | 9ce75d1984fe0c6851df142cb68fb19d01327d79 | |
| parent | Merge pull request #1305 from mc-server/Food (diff) | |
| download | cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar.gz cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar.bz2 cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar.lz cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar.xz cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.tar.zst cuberite-63a07b7ffc0d34beba6752c3c1f4f5771eb2c36b.zip | |
| -rw-r--r-- | src/Entities/Player.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 8fa060a5d..8667344c7 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -906,6 +906,10 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) } GetWorld()->BroadcastChatDeath(Printf("%s %s", GetName().c_str(), DamageText.c_str())); } + else if (a_TDI.Attacker == NULL) // && !m_World->ShouldBroadcastDeathMessages() by fallthrough + { + // no-op + } else if (a_TDI.Attacker->IsPlayer()) { cPlayer * Killer = (cPlayer *)a_TDI.Attacker; |