projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity

Fix for #958, #959

Browse Source 
- Added a way to obtain a pet without BEing
- Attempted to figure out how to bring up the pet tool bar
This commit is contained in:
CharonInferar
2014-07-05 18:10:39 +02:00
parent 0315292368
commit 0985451d7d
22 changed files with 933 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+8 -3
View File
@@ -143,7 +143,7 @@ public class PlayerObject extends IntangibleObject implements Serializable {
baseline.put("12", (long) 0); // General?
baseline.put("13", 0); // Guild Rank Title?
baseline.put("14", (short) 0); // Citizen Rank Title? 6 bytes
baseline.put("speederElevation", 0);
baseline.put("speederElevation", 1);
baseline.put("vehicleAttackCommand", "");
return baseline;
}
@@ -187,8 +187,8 @@ public class PlayerObject extends IntangibleObject implements Serializable {
baseline.put("kills", 0);
baseline.put("19", 0);
baseline.put("pet", (long) 0);
baseline.put("petAbilities", new SWGList<String>(this, 9, 15, false));
baseline.put("22", (long) 0); // Unknown type currently
baseline.put("petAbilities", new SWGList<String>(this, 9, 21, false));
baseline.put("activePetAbilities", new SWGList<String>(this, 9, 22, false));
baseline.put("23", (byte) 0); // Seen as 1 or 2 sometimes // Gets set to 0x02 sometimes
baseline.put("24", 0); // Seen as 4
baseline.put("25", (long) 0); // Bitmask starts with 0x20 ends with 0x40
@@ -786,6 +786,11 @@ public class PlayerObject extends IntangibleObject implements Serializable {
public SWGList<String> getPetAbilities() {
return (SWGList<String>) getBaseline(9).get("petAbilities");
}
@SuppressWarnings("unchecked")
public SWGList<String> getActivePetAbilities() {
return (SWGList<String>) getBaseline(9).get("activePetAbilities");
}
public int getJediState() {
return 0;