projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Fixed some long-term buff issues.

Browse Source 
We've had a completely incorrect buff structure in baselines for the last year due to some small misinterpretations of its structure.  It worked because there was the right amount of bytes, but otherwise the structure wasn't right and variables have been in the wrong place.  Specifically, we interpreted the stack variable (which comes last) to be the beginning of all buffs except the first, assumed there was an abnormal starting buff, and treated the final stack variable as an unknown variable that comes after the buff list.  This is most likely also why it didn't work without this "default buff".  The structure has been correct in Buff.getBytes() and buff deltas for a while but has been incorrect for baselines.
This commit is contained in:
Treeku
2014-08-21 18:56:23 +01:00
parent 3d1f244f4d
commit 73eebd1d06
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+8 -5
View File
@@ -51,7 +51,6 @@ import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.skills.SkillMod;
import resources.buffs.Buff;
import resources.buffs.BuffList;
import resources.buffs.DamageOverTime;
import resources.common.OutOfBand;
import resources.datatables.Difficulty;
@@ -104,7 +103,6 @@ public class CreatureObject extends TangibleObject implements IPersistent {
getMaxAttribs().add(0);
getMaxAttribs().add(300);
getMaxAttribs().add(0);
getBuffList().put(0, new Buff("", getObjectID())); // Initial Default Buff
}
public CreatureObject() {
@@ -189,7 +187,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
baseline.put("equipmentList", new SWGList<Equipment>(this, 6, 23, false));
baseline.put("appearance", "");
baseline.put("visible", true);
baseline.put("buffList", new BuffList(new SWGMap<Integer, Buff>(this, 6, 26, false)));
baseline.put("buffList", new SWGMap<Integer, Buff>(this, 6, 26, true));
baseline.put("performing", false);
baseline.put("difficulty", Difficulty.NORMAL);
baseline.put("hologramColor", -1);
@@ -967,8 +965,9 @@ public class CreatureObject extends TangibleObject implements IPersistent {
setVisible(!cloaked);
}
@SuppressWarnings("unchecked")
public SWGMap<Integer, Buff> getBuffList() {
return ((BuffList) getBaseline(6).get("buffList")).getList();
return (SWGMap<Integer, Buff>) getBaseline(6).get("buffList");
}
public Buff getBuffByName(String buffName) {
@@ -982,8 +981,12 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
public void addBuff(Buff buff) {
if (buff == null) {
System.err.println("CreatureObject:addBuff(): Attempting to add a null Buff object. Something is wrong in BuffService!");
}
synchronized(objectMutex) {
PlayerObject player = (PlayerObject) this.getSlottedObject("ghost");
PlayerObject player = (PlayerObject) getSlottedObject("ghost");
buff.setTotalPlayTime((int) (player.getTotalPlayTime() + (System.currentTimeMillis() - player.getLastPlayTimeUpdate()) / 1000));
}