Sanity checks

OpenMeridian · Mar 2, 2015 · 16dd6c9 · 16dd6c9
1 parent c27a10e
commit 16dd6c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/kod/object/active/holder/nomoveon/battler/monster.kod b/kod/object/active/holder/nomoveon/battler/monster.kod
@@ -6513,6 +6513,7 @@ messages:
    TargetSwitch(what=$, iHatred = 0)
    {
       if what = $
+         OR poOwner = $
       {
          Debug("BAD target we're switching to here!");
 

diff --git a/kod/object/active/holder/room/monsroom/survivalroom.kod b/kod/object/active/holder/room/monsroom/survivalroom.kod
@@ -911,7 +911,7 @@ messages:
          {
             if Nth(i,1) = GOAL_KILLS
             {
-               Send(self,@AggroBosses);
+               Post(self,@AggroBosses);
             }
             if Nth(i,1) = GOAL_BOSS
             {
@@ -960,7 +960,10 @@ messages:
             else
             {
                % Aggro one mob on the player.
-               Send(self,@AggroOne,#who=(First(plParticipants)));
+               if plLevelGoals <> $
+               {
+                  Send(self,@AggroOne,#who=(First(plParticipants)));
+               }
             }
          }
       }
@@ -991,6 +994,7 @@ messages:
       local oTarget, i, n, each_obj, count;
 
       if plParticipants = $
+         OR plLevelGoals = $
       {
          return;
       }
@@ -1024,7 +1028,6 @@ messages:
                      }
                   }
                }
-
                Send(each_obj,@TargetSwitch,#what=oTarget,#iHatred=100);
                Send(each_obj,@EnterStateChase,#target=oTarget,#actnow=True);
             }