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

Dueling implementation now only requires one list of CreatureObjects (instead of two)

Browse Source
This commit is contained in:
Iosnowore
2017-04-04 19:17:16 -07:00
parent c6fbabf0e1
commit bc1112650c
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+11 -9
View File
@@ -84,8 +84,6 @@ public class CreatureObject extends TangibleObject {
private SWGList<Integer> baseAttributes = new SWGList<Integer>(1, 2);
private List<CreatureObject> activeDuels = new ArrayList<>();
private List<CreatureObject> sentDuels = new ArrayList<>();
public CreatureObject(long objectId) {
@@ -803,20 +801,24 @@ public class CreatureObject extends TangibleObject {
return isEnemy(otherObject) && otherPosture != Posture.INCAPACITATED && otherPosture != Posture.DEAD;
}
public boolean hasSentDuelRequestToPlayer(CreatureObject player) {
return sentDuels.contains(player);
}
public boolean sentDuelRequestToPlayer(CreatureObject player) {
return sentDuels.contains(player);
}
public boolean isInDuelWithPlayer(CreatureObject player) {
return activeDuels.contains(player);
public boolean isDuelingPlayer(CreatureObject player) {
return sentDuelRequestToPlayer(player) && player.sentDuelRequestToPlayer(this);
}
public List<CreatureObject> getActiveDuels() {
return activeDuels;
public void addPlayerToSentDuels(CreatureObject player) {
sentDuels.add(player);
}
public List<CreatureObject> getSentDuels() {
return sentDuels;
public void removePlayerFromSentDuels(CreatureObject player) {
sentDuels.remove(player);
}
@Override
@@ -827,7 +829,7 @@ public class CreatureObject extends TangibleObject {
return tangibleEnemy;
}
if (activeDuels.contains(otherObject))
if (isDuelingPlayer((CreatureObject)otherObject))
return true;
return isPlayer() && ((CreatureObject) otherObject).isPlayer()