aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2014_09_18_01_world_misc.sql2
-rw-r--r--src/server/game/Handlers/PetHandler.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/updates/world/2014_09_18_01_world_misc.sql b/sql/updates/world/2014_09_18_01_world_misc.sql
index 964420d4ab6..0100573c404 100644
--- a/sql/updates/world/2014_09_18_01_world_misc.sql
+++ b/sql/updates/world/2014_09_18_01_world_misc.sql
@@ -1,4 +1,4 @@
-SET @CGuid := 74517;
+SET @CGuid := 74518;
DELETE FROM `creature` WHERE `id`IN(24014,29393)AND `guid` BETWEEN @CGUID AND @CGUID+3;
UPDATE `creature_template` SET `faction`=21, `unit_flags`=33536, `unit_flags2`=2099200 WHERE `entry`=29394;
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index cb58d8968e8..1a2a571266d 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -270,7 +270,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
{
case REACT_PASSIVE: //passive
pet->AttackStop();
-
+ // no break;
case REACT_DEFENSIVE: //recovery
case REACT_AGGRESSIVE: //activete
if (pet->GetTypeId() == TYPEID_UNIT)