diff options
| author | Mattes D <github@xoft.cz> | 2014-08-10 22:30:26 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-08-10 22:30:26 +0200 |
| commit | babc8b2d18c5721286d9693b15bb3ccb8ccd24c5 (patch) | |
| tree | 21af85b986019c3a8bd430dca42b3d166527f4d4 | |
| parent | Merge pull request #1299 from mc-server/Slabs (diff) | |
| parent | Spaces (diff) | |
| download | cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar.gz cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar.bz2 cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar.lz cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar.xz cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.tar.zst cuberite-babc8b2d18c5721286d9693b15bb3ccb8ccd24c5.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..608316e9a 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; |