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

Fixed an issue where NPCs were unattackable

Browse Source
This commit is contained in:
Mads Boddum
2016-10-27 05:32:23 +02:00
parent c4ff28c7da
commit de09948088
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+8 -11
View File
@@ -42,6 +42,7 @@ import network.packets.swg.zone.baselines.Baseline.BaselineType;
import network.packets.swg.zone.object_controller.PostureUpdate;
import resources.HologramColour;
import resources.Posture;
import resources.PvpFaction;
import resources.PvpFlag;
import resources.PvpStatus;
import resources.Race;
@@ -795,19 +796,15 @@ public class CreatureObject extends TangibleObject {
@Override
public boolean isEnemy(TangibleObject otherObject) {
if (!super.isEnemy(otherObject)) {
return false;
boolean tangibleEnemy = super.isEnemy(otherObject);
if (tangibleEnemy || !(otherObject instanceof CreatureObject)) {
return tangibleEnemy;
}
if (!(otherObject instanceof CreatureObject)) {
return false;
}
if (!isPlayer() || !((CreatureObject) otherObject).isPlayer()) {
return false;
}
return getPvpStatus() == PvpStatus.SPECIALFORCES && otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES;
return isPlayer() && ((CreatureObject) otherObject).isPlayer()
&& getPvpStatus() == PvpStatus.SPECIALFORCES
&& otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES;
}
@Override