From 08de97a2a8a9ff8abea43fd0ec1b5d9e66cf8a48 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 7 Sep 2023 09:55:55 -0400 Subject: [PATCH] Guild check removed from outlaw condition. --- src/engine/gameManager/CombatManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index a6ae4d7b..0fc0f776 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -144,7 +144,7 @@ public enum CombatManager { City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc()); - if (playerCity != null && playerCity.getGuild().getNation().equals(playerCharacter.getGuild().getNation()) == false && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false) + if (playerCity != null && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false) playerCity.cityOutlaws.add(playerCharacter.getObjectUUID()); }