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 a bug where you could attack yourself with placed AoE

Browse Source
This commit is contained in:
Mads Boddum
2017-02-28 09:22:54 +01:00
parent 29a2d1296b
commit 47980e9de4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+4
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;
@@ -807,6 +808,9 @@ public class CreatureObject extends TangibleObject {
}
return isPlayer() && ((CreatureObject) otherObject).isPlayer()
&& getPvpFaction() != PvpFaction.NEUTRAL
&& otherObject.getPvpFaction() != PvpFaction.NEUTRAL
&& getPvpFaction() != otherObject.getPvpFaction()
&& getPvpStatus() == PvpStatus.SPECIALFORCES
&& otherObject.getPvpStatus() == PvpStatus.SPECIALFORCES;
}