From 6fb87cb8ab5c6dec483d43dbbaf23f1c293fd8f8 Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Mon, 5 May 2014 20:39:46 -0700 Subject: [PATCH] explicit compare to nullptr --- zone/attack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/attack.cpp b/zone/attack.cpp index c0430cf56..a232e2a7c 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -452,7 +452,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte) if(damage > 0 && (aabonuses.TwoHandBluntBlock || spellbonuses.TwoHandBluntBlock || itembonuses.TwoHandBluntBlock) && (other->InFrontMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) { - bool equiped2 = CastToClient()->m_inv.GetItem(13); + bool equiped2 = CastToClient()->m_inv.GetItem(13) != nullptr; if(equiped2) { uint8 TwoHandBlunt = CastToClient()->m_inv.GetItem(13)->GetItem()->ItemType; float bonusStaffBlock = 0.0f;