projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-01 16:12:53 -04:00
Code Issues Projects Releases Wiki Activity

Increased consistency in TangibleObject.isEnemy()

Browse Source
This commit is contained in:
Mads Boddum
2018-02-25 16:36:36 +01:00
parent 014cca7f19
commit 9a85cacf17
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/objects/tangible/TangibleObject.java
+1 -1
View File
@@ -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