diff --git a/CreatureMethods.h b/CreatureMethods.h
index 7bd33c0..5b7e12e 100644
--- a/CreatureMethods.h
+++ b/CreatureMethods.h
@@ -1012,7 +1012,12 @@ namespace LuaCreature
      */
     int SetInCombatWithZone(lua_State* /*L*/, Creature* creature)
     {
+#ifdef TRINITY
+        if (creature->IsAIEnabled)
+            creature->AI()->DoZoneInCombat();
+#else
         creature->SetInCombatWithZone();
+#endif
         return 0;
     }