diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-11-18 14:56:32 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-11-18 14:56:32 +0100 |
| commit | 42120e2ea5db0cdb9920ff1c5efef33e0f496d48 (patch) | |
| tree | 20ba1ae0a53f757cb8814b6cd6a466fe5acf1308 /src/Mobs/ZombiePigman.cpp | |
| parent | Fixed compile errors. (diff) | |
| parent | Merge pull request #1598 from mc-server/SignEditor (diff) | |
| download | cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.gz cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.bz2 cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.lz cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.xz cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.tar.zst cuberite-42120e2ea5db0cdb9920ff1c5efef33e0f496d48.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/ZombiePigman.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Mobs/ZombiePigman.cpp b/src/Mobs/ZombiePigman.cpp index 05350f877..8b415b0af 100644 --- a/src/Mobs/ZombiePigman.cpp +++ b/src/Mobs/ZombiePigman.cpp @@ -19,7 +19,7 @@ cZombiePigman::cZombiePigman(void) : void cZombiePigman::GetDrops(cItems & a_Drops, cEntity * a_Killer) { int LootingLevel = 0; - if (a_Killer != NULL) + if (a_Killer != nullptr) { LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting); } @@ -41,7 +41,7 @@ void cZombiePigman::KilledBy(TakeDamageInfo & a_TDI) { super::KilledBy(a_TDI); - if ((a_TDI.Attacker != NULL) && (a_TDI.Attacker->IsPlayer())) + if ((a_TDI.Attacker != nullptr) && (a_TDI.Attacker->IsPlayer())) { // TODO: Anger all nearby zombie pigmen // TODO: In vanilla, if one player angers ZPs, do they attack any nearby player, or only that one attacker? |