Instructions Jenkins Doxygen

[Fixed] pets sometimes being able to attack while incapacitated 57/1657/1
authorIvojedi <ivojedi@swgemu.com>
Mon, 12 May 2014 14:15:15 +0000 (07:15 -0700)
committerIvojedi <ivojedi@swgemu.com>
Mon, 12 May 2014 14:15:15 +0000 (07:15 -0700)
Change-Id: I37de3ec3634313af365efcbfa0ade23e0798fbc6

MMOCoreORB/src/server/zone/objects/creature/commands/CombatQueueCommand.h

index 6e8236e..9045e63 100644 (file)
@@ -153,7 +153,7 @@ public:
                        checkRange = weapon->getMaxRange();
                }
 
-               if (creature->isDead())
+               if (creature->isDead() || (creature->isPet() && creature->isIncapacitated()))
                        return INVALIDLOCOMOTION;
 
                if (creature->isPlayerCreature()){