1 files changed, 13 insertions, 11 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 11f6f8d0f36..06c8f60a1fb 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -354,23 +354,18 @@ int32 CreatureAI::VisualizeBoundary(uint32 duration, Unit* owner, bool fill) con
 
 bool CreatureAI::CheckBoundary(Position const* who) const
 {
+    if (!_boundary)
+        return true;
+
     if (!who)
         who = me;
 
-    if (_boundary)
-        for (AreaBoundary const* areaBoundary : *_boundary)
-            if (!areaBoundary->IsWithinBoundary(who))
-                return false;
-
-    return true;
+    return (CreatureAI::IsInBounds(*_boundary, who) != _negateBoundary);
 }
 
-bool CreatureAI::IsInBounds(CreatureBoundary const* boundary, Position const* pos)
+bool CreatureAI::IsInBounds(CreatureBoundary const& boundary, Position const* pos)
 {
-    if (!boundary)
-        return true;
-
-    for (AreaBoundary const* areaBoundary : *boundary)
+    for (AreaBoundary const* areaBoundary : boundary)
         if (!areaBoundary->IsWithinBoundary(pos))
             return false;
 
@@ -388,6 +383,13 @@ bool CreatureAI::CheckInRoom()
     }
 }
 
+void CreatureAI::SetBoundary(CreatureBoundary const* boundary, bool negateBoundaries /*= false*/)
+{
+    _boundary = boundary;
+    _negateBoundary = negateBoundaries;
+    me->DoImmediateBoundaryCheck();
+}
+
 Creature* CreatureAI::DoSummon(uint32 entry, const Position& pos, uint32 despawnTime, TempSummonType summonType)
 {
     return me->SummonCreature(entry, pos, summonType, despawnTime);