diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-10-23 14:59:42 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-10-23 14:59:42 +0200 |
| commit | 72bb299a4a4f74840c3b368c6669ddc3d32006ee (patch) | |
| tree | 748fee756010b1f36aa95162f762e21ee0d19c0a /src/Mobs/Villager.cpp | |
| parent | Merge branch 'master' into ChunkLoader (diff) | |
| parent | Fixed a crash in redstone simulator. (diff) | |
| download | cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.gz cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.bz2 cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.lz cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.xz cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.zst cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/Villager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Mobs/Villager.cpp b/src/Mobs/Villager.cpp index 0efd5501e..5c9999a59 100644 --- a/src/Mobs/Villager.cpp +++ b/src/Mobs/Villager.cpp @@ -30,7 +30,7 @@ bool cVillager::DoTakeDamage(TakeDamageInfo & a_TDI) return false; } - if ((a_TDI.Attacker != NULL) && a_TDI.Attacker->IsPlayer()) + if ((a_TDI.Attacker != nullptr) && a_TDI.Attacker->IsPlayer()) { if (m_World->GetTickRandomNumber(5) == 3) { |