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/creature/CreatureObject.java
+27 -39
View File
@@ -29,6 +29,7 @@ package resources.objects.creature;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.util.HashMap;
@@ -109,19 +110,18 @@ public class CreatureObject extends TangibleObject {
private long lastTransform = 0;
private HologramColour hologramColour = HologramColour.DEFAULT;
private SWGList<Integer> baseAttributes = new SWGList<Integer>(BaselineType.CREO, 1, 2);
private SWGList<String> skills = new SWGList<String>(BaselineType.CREO, 1, 3, StringType.ASCII); // SWGSet
private SWGList<Integer> hamEncumbList = new SWGList<Integer>(BaselineType.CREO, 4, 2);
private SWGList<Integer> attributes = new SWGList<Integer>(BaselineType.CREO, 6, 21);
private SWGList<Integer> maxAttributes = new SWGList<Integer>(BaselineType.CREO, 6, 22);
private SWGList<Equipment> equipmentList = new SWGList<Equipment>(BaselineType.CREO, 6, 23);
private SWGList<Equipment> appearanceList = new SWGList<Equipment>(BaselineType.CREO, 6, 33);
private SWGList<Integer> baseAttributes = new SWGList<Integer>(1, 2);
private SWGList<String> skills = new SWGList<String>(1, 3, StringType.ASCII); // SWGSet
private SWGList<Integer> hamEncumbList = new SWGList<Integer>(4, 2);
private SWGList<Integer> attributes = new SWGList<Integer>(6, 21);
private SWGList<Integer> maxAttributes = new SWGList<Integer>(6, 22);
private SWGList<Equipment> equipmentList = new SWGList<Equipment>(6, 23);
private SWGList<Equipment> appearanceList = new SWGList<Equipment>(6, 33);
private SWGMap<String, SkillMod> skillMods = new SWGMap<>(BaselineType.CREO, 4, 3, StringType.ASCII);
private SWGMap<Long, Long> missionCriticalObjs = new SWGMap<>(BaselineType.CREO, 4, 13);
private SWGMap<String, Integer> abilities = new SWGMap<>(BaselineType.CREO, 4, 14, StringType.ASCII);
private SWGMap<Integer, Buff> buffs = new SWGMap<>(BaselineType.CREO, 6, 26);
private SWGMap<String, SkillMod> skillMods = new SWGMap<>(4, 3, StringType.ASCII);
private SWGMap<Long, Long> missionCriticalObjs = new SWGMap<>(4, 13);
private SWGMap<String, Integer> abilities = new SWGMap<>(4, 14, StringType.ASCII);
private SWGMap<Integer, Buff> buffs = new SWGMap<>(6, 26);
public CreatureObject(long objectId) {
super(objectId, BaselineType.CREO);
@@ -668,6 +668,7 @@ public class CreatureObject extends TangibleObject {
if(!buffs.containsKey(buffCrc)) {
buffs.put(buffCrc, buff);
buffs.sendDeltaMessage(this);
System.out.println("added buff");
}
}
@@ -676,6 +677,7 @@ public class CreatureObject extends TangibleObject {
if(buffs.containsKey(buffCrc)) {
buffs.remove(buffCrc);
buffs.sendDeltaMessage(this);
System.out.println("removed buff");
}
}
@@ -854,36 +856,21 @@ public class CreatureObject extends TangibleObject {
}
public void sendBaselines(Player target) {
BaselineBuilder bb = null;
boolean targetSelf = getOwner() == target;
if (getOwner() == target) {
bb = new BaselineBuilder(this, BaselineType.CREO, 1);
createBaseline1(target, bb);
bb.sendTo(target);
}
if (targetSelf)
target.sendPacket(createBaseline1(target));
bb = new BaselineBuilder(this, BaselineType.CREO, 3);
createBaseline3(target, bb);
bb.sendTo(target);
target.sendPacket(createBaseline3(target));
if (getOwner() == target) {
bb = new BaselineBuilder(this, BaselineType.CREO, 4);
createBaseline4(target, bb);
bb.sendTo(target);
}
if (targetSelf)
target.sendPacket(createBaseline4(target));
bb = new BaselineBuilder(this, BaselineType.CREO, 6);
createBaseline6(target, bb);
bb.sendTo(target);
target.sendPacket(createBaseline6(target));
if (getOwner() == target) {
bb = new BaselineBuilder(this, BaselineType.CREO, 8);
createBaseline8(target, bb);
bb.sendTo(target);
bb = new BaselineBuilder(this, BaselineType.CREO, 9);
createBaseline9(target, bb);
bb.sendTo(target);
if (targetSelf) {
target.sendPacket(createBaseline8(target));
target.sendPacket(createBaseline9(target));
}
}
@@ -893,8 +880,9 @@ public class CreatureObject extends TangibleObject {
target.sendPacket(new UpdatePostureMessage(posture.getId(), getObjectId()));
if (getOwner() != null && target != getOwner()) {
target.sendPacket(new UpdatePvpStatusMessage(PvpFlag.PLAYER, 0, getObjectId()));
if (target != getOwner()) {
Set<PvpFlag> flags = PvpFlag.getFlags(getPvpFlags());
target.sendPacket(new UpdatePvpStatusMessage(getPvpFaction(), getObjectId(), flags.toArray(new PvpFlag[flags.size()])));
}
}