Merge pull request #378 from ao-org/fix-user-kill-pet

fix can attack npc test to prevent attacking pets on safe areas
ao-org · Sep 8, 2023 · 2ec7f7b · 2ec7f7b
2 parents 5dc754c + add7d34
commit 2ec7f7b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Codigo/MODULO_NPCs.bas b/Codigo/MODULO_NPCs.bas
@@ -2062,6 +2062,10 @@ On Error GoTo UserCanAttackNpc_Err
             Exit Function
         End If
      End If
+     If IsPet And MapInfo(UserList(UserIndex).pos.Map).Seguro Then
+        UserCanAttackNpc = eSafeArea
+        Exit Function
+     End If
      ' El seguro es SOLO para ciudadanos. La armada debe desenlistarse antes de querer atacar y se checkea arriba.
      ' Los criminales o Caos, ya estan mas alla del seguro.
 164  If Status(UserIndex) = Ciudadano Then