projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-21 11:03:13 -04:00
Code Issues Projects Releases Wiki Activity

CreatureObject.isEnemy() is now more readable

Browse Source
This commit is contained in:
Mads Boddum
2016-10-27 03:52:37 +02:00
parent 4ff6b474ed
commit 16f6c6fdb6
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+12 -12
View File
@@ -795,19 +795,19 @@ public class CreatureObject extends TangibleObject {
@Override
public boolean isEnemy(TangibleObject otherObject) {
boolean enemy = super.isEnemy(otherObject);
if (enemy && otherObject instanceof CreatureObject) {
PvpStatus ourStatus = getPvpStatus();
PvpStatus theirStatus = otherObject.getPvpStatus();
if (isPlayer() && ((CreatureObject) otherObject).isPlayer()) {
// They are enemies if both players are SF
return ourStatus == PvpStatus.SPECIALFORCES && theirStatus == PvpStatus.SPECIALFORCES;
}
if (!super.isEnemy(otherObject)) {
return false;
}
return enemy;
if (!(otherObject instanceof CreatureObject)) {
return false;
}
if (!isPlayer() || !((CreatureObject) otherObject).isPlayer()) {
return false;
}
return getPvpStatus() == PvpStatus.SPECIALFORCES && otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES;
}
@Override