From 9a85cacf17860e618bdcfdbec38d4d4cb16bcbb6 Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Sun, 25 Feb 2018 16:36:36 +0100
Subject: [PATCH] Increased consistency in TangibleObject.isEnemy()

---
 .../holocore/resources/objects/tangible/TangibleObject.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/projectswg/holocore/resources/objects/tangible/TangibleObject.java b/src/main/java/com/projectswg/holocore/resources/objects/tangible/TangibleObject.java
index 3a8e0eb0a..606111677 100644
--- a/src/main/java/com/projectswg/holocore/resources/objects/tangible/TangibleObject.java
+++ b/src/main/java/com/projectswg/holocore/resources/objects/tangible/TangibleObject.java
@@ -262,7 +262,7 @@ public class TangibleObject extends SWGObject {
 			return true;
 		}
 		
-		PvpFaction ourFaction = pvpFaction;
+		PvpFaction ourFaction = getPvpFaction();
 		PvpFaction otherFaction = otherObject.getPvpFaction();
 		
 		return otherFaction != PvpFaction.NEUTRAL && ourFaction != PvpFaction.NEUTRAL && ourFaction != otherFaction