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

Changed PR based on Oblique's comments.

Browse Source 
Also Added .db-journal to git ignore (file created by a 3d party SQLite GUI program)
This commit is contained in:
Iosnowore
2017-04-04 14:01:55 -07:00
parent d872ac4c87
commit 77231fa85c
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+7 -6
View File
@@ -30,6 +30,7 @@ package resources.objects.creature;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Locale;
import java.util.function.Predicate;
@@ -79,13 +80,13 @@ public class CreatureObject extends TangibleObject {
private long statesBitmask = 0;
private long lastTransform = 0;
private SWGSet<String> skills = new SWGSet<String>(1, 3, StringType.ASCII);
private SWGSet<String> skills = new SWGSet<String>(1, 3, StringType.ASCII);
private SWGList<Integer> baseAttributes = new SWGList<Integer>(1, 2);
private SWGList<Integer> baseAttributes = new SWGList<Integer>(1, 2);
private ArrayList<CreatureObject> activeDuels = new ArrayList<CreatureObject>();
private List<CreatureObject> activeDuels = new ArrayList<>();
private ArrayList<CreatureObject> sentDuels = new ArrayList<CreatureObject>();
private List<CreatureObject> sentDuels = new ArrayList<>();
public CreatureObject(long objectId) {
super(objectId, BaselineType.CREO);
@@ -810,11 +811,11 @@ public class CreatureObject extends TangibleObject {
return activeDuels.contains(player);
}
public ArrayList<CreatureObject> getActiveDuels() {
public List<CreatureObject> getActiveDuels() {
return activeDuels;
}
public ArrayList<CreatureObject> getSentDuels() {
public List<CreatureObject> getSentDuels() {
return sentDuels;
}