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

Merge branch 'quality_assurance' of https://bitbucket.org/M4SS/holocore into buffs

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/services/galaxy/GameManager.java
This commit is contained in:
Mads Boddum
2016-02-19 16:30:38 +01:00
parent 6912e0b55a 05705e983a
commit da3a8c5fe3
141 changed files with 142784 additions and 139593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+27 -15
View File
@@ -30,6 +30,7 @@ package resources.objects.player;
import network.packets.swg.zone.UpdatePostureMessage;
import network.packets.swg.zone.baselines.Baseline.BaselineType;
import network.packets.swg.zone.chat.ChatSystemMessage;
import resources.collections.SWGFlag;
import resources.collections.SWGBitSet;
import resources.collections.SWGList;
import resources.collections.SWGMap;
@@ -45,6 +46,7 @@ import utilities.MathUtils;
import utilities.Encoder.StringType;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -57,8 +59,8 @@ public class PlayerObject extends IntangibleObject {
private List<String> joinedChannels = new ArrayList<>();
// PLAY 03
private SWGBitSet flagsList = new SWGBitSet(BaselineType.PLAY, 3, 5);
private SWGBitSet profileFlags = new SWGBitSet(BaselineType.PLAY, 3, 6);
private SWGFlag flagsList = new SWGFlag(3, 5);
private SWGFlag profileFlags = new SWGFlag(3, 6);
private String title = "";
private int bornDate = 0;
private int playTime = 0;
@@ -67,8 +69,8 @@ public class PlayerObject extends IntangibleObject {
private int pvpKills = 0;
private long lifetimeGcwPoints = 0;
private int lifetimePvpKills = 0;
private SWGList<Integer> collections = new SWGList<>(BaselineType.PLAY, 3, 16);
private SWGList<Integer> guildRanks = new SWGList<>(BaselineType.PLAY, 3, 17);
private SWGBitSet collectionBadges = new SWGBitSet(3, 16);
private SWGList<Integer> guildRanks = new SWGList<>(3, 17);
private boolean showHelmet = true;
private boolean showBackpack = true;
// PLAY 06
@@ -80,27 +82,27 @@ public class PlayerObject extends IntangibleObject {
private int gcwNextUpdate = 0;
private String home = "";
// PLAY 08
private SWGMap<String, Integer> experience = new SWGMap<>(BaselineType.PLAY, 8, 0);
private SWGMap<Long, WaypointObject> waypoints = new SWGMap<>(BaselineType.PLAY, 8, 1);
private SWGMap<String, Integer> experience = new SWGMap<>(8, 0);
private SWGMap<Long, WaypointObject> waypoints = new SWGMap<>(8, 1);
private boolean citizen = false;
private int guildRankTitle = 0;
private int activeQuest = 0;
private SWGMap<Integer, Integer> quests = new SWGMap<>(BaselineType.PLAY, 8, 7);
private SWGMap<Integer, Integer> quests = new SWGMap<>(8, 7);
private String profWheelPosition = "";
// PLAY 09
private int experimentFlag = 0;
private int craftingStage = 0;
private long nearbyCraftStation = 0;
private SWGList<String> draftSchemList = new SWGList<>(BaselineType.PLAY, 9, 3);
private SWGList<String> draftSchemList = new SWGList<>(9, 3);
private int experimentPoints = 0;
private SWGList<String> friendsList = new SWGList<>(BaselineType.PLAY, 9, 7, StringType.ASCII);
private SWGList<String> ignoreList = new SWGList<>(BaselineType.PLAY, 9, 8, StringType.ASCII);
private SWGList<String> friendsList = new SWGList<>(9, 7, StringType.ASCII);
private SWGList<String> ignoreList = new SWGList<>(9, 8, StringType.ASCII);
private int languageId = 0;
private SWGList<Long> defenders = new SWGList<>(BaselineType.PLAY, 9, 17); // TODO: Change to set
private SWGList<Long> defenders = new SWGList<>(9, 17); // TODO: Change to set
private int killMeter = 0;
private long petId = 0;
private SWGList<String> petAbilities = new SWGList<>(BaselineType.PLAY, 9, 21);
private SWGList<String> activePetAbilities = new SWGList<>(BaselineType.PLAY, 9, 22);
private SWGList<String> petAbilities = new SWGList<>(9, 21);
private SWGList<String> activePetAbilities = new SWGList<>(9, 22);
private int startPlayTime;
public PlayerObject(long objectId) {
@@ -152,7 +154,7 @@ public class PlayerObject extends IntangibleObject {
this.title = title;
sendDelta(3, 7, title, StringType.ASCII);
}
public int getPlayTime() {
int startTime = getStartPlayTime();
int deltaTime = (int) ((System.currentTimeMillis()) - startTime);
@@ -201,6 +203,16 @@ public class PlayerObject extends IntangibleObject {
this.lifetimePvpKills = lifetimePvpKills;
sendDelta(3, 15, lifetimePvpKills);
}
public byte[] getCollectionBadges() {
return collectionBadges.toByteArray();
}
public void setCollectionBadges(byte[] collection) {
this.collectionBadges.clear();
this.collectionBadges.or(BitSet.valueOf(collection));
sendDelta(3, 16, collectionBadges);
}
public SWGList<Integer> getGuildRanks() {
return guildRanks;
@@ -496,7 +508,7 @@ public class PlayerObject extends IntangibleObject {
bb.addInt(pvpKills); // 13
bb.addLong(lifetimeGcwPoints); // 14
bb.addInt(lifetimePvpKills); // 15
bb.addObject(collections); // 16
bb.addObject(collectionBadges); // 16
bb.addObject(guildRanks); // 17
bb.addBoolean(showBackpack); // 18
bb.addBoolean(showHelmet); // 19