From 72ac0a2452ec5fcce70e611b9bf2b24fdd4d3b5a Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 6 Jun 2009 19:59:04 -0500
Subject: *Fix incorrect check of trap charges.

--HG--
branch : trunk
---
 src/game/GameObject.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/game/GameObject.cpp')

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index c8021c8bb8b..239fe826087 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -324,8 +324,6 @@ void GameObject::Update(uint32 /*p_time*/)
                         return;
                 }
 
-                bool NeedDespawn = (goInfo->trap.charges != 0);
-
                 // Note: this hack with search required until GO casting not implemented
                 // search unfriendly creature
                 if(owner)                    // hunter trap
@@ -359,7 +357,7 @@ void GameObject::Update(uint32 /*p_time*/)
                     else
                         m_cooldownTime = time(NULL) + 4;        // 4 seconds
 
-                    if(NeedDespawn)
+                    if(owner)
                         SetLootState(GO_JUST_DEACTIVATED);  // can be despawned or destroyed
 
                     if(IsBattleGroundTrap && ok->GetTypeId() == TYPEID_PLAYER)
-- 
cgit v1.2.3