projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-01 02:16:15 -04:00
Code Issues Projects Releases Wiki Activity

Cleaned up Buff object

Browse Source
This commit is contained in:
Treeku
2014-08-28 07:36:33 +01:00
parent 5b280731c2
commit ea417cb7a5
1 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/buffs/Buff.java
+15 -33
View File
@@ -146,43 +146,25 @@ public class Buff extends Delta {
public byte[] getBytes() {
// If getObject ever returns null here, it means there's a major bug with objects being in quadtree but not in objectList.
if (NGECore.getInstance().objectService.getObject(buffeeId)==null){
if (NGECore.getInstance().objectService.getObject(buffeeId) == null){
System.err.println("FATAL ERROR BUFFED CREATURE NOT IN OBJECTLIST");
return new byte[]{};
}
CreatureObject cre = (CreatureObject)NGECore.getInstance().objectService.getObject(buffeeId);
// NPCs should be considered here to
if (cre.isPlayer()){
PlayerObject player = (PlayerObject) NGECore.getInstance().objectService.getObject(buffeeId).getSlottedObject("ghost");
long lastPlayTimeUpdate = ((player == null) ? 0L : player.getLastPlayTimeUpdate());
int remainingDuration = getRemainingDuration();
synchronized(objectMutex) {
totalPlayTime = ((player == null) ? 0 : (int) (totalPlayTime + (System.currentTimeMillis() - lastPlayTimeUpdate) / 1000));
IoBuffer buffer = createBuffer(24);
buffer.putInt((int) ((duration > 0) ? (totalPlayTime + remainingDuration) : -1));
buffer.putInt(0);
buffer.putInt((int) duration);
buffer.putLong(bufferId);
buffer.putInt(stacks);
buffer.flip();
return buffer.array();
}
} else {
int remainingDuration = getRemainingDuration();
synchronized(objectMutex) {
totalPlayTime = 0;
IoBuffer buffer = createBuffer(24);
buffer.putInt((int) ((duration > 0) ? (totalPlayTime + remainingDuration) : -1));
buffer.putInt(0);
buffer.putInt((int) duration);
buffer.putLong(bufferId);
buffer.putInt(stacks);
buffer.flip();
return buffer.array();
}
PlayerObject player = (PlayerObject) NGECore.getInstance().objectService.getObject(buffeeId).getSlottedObject("ghost");
long lastPlayTimeUpdate = ((player == null) ? 0L : player.getLastPlayTimeUpdate());
int remainingDuration = getRemainingDuration();
synchronized(objectMutex) {
totalPlayTime = ((player == null) ? 0 : (int) (totalPlayTime + (System.currentTimeMillis() - lastPlayTimeUpdate) / 1000));
IoBuffer buffer = createBuffer(24);
buffer.putInt((int) ((duration > 0) ? (totalPlayTime + remainingDuration) : -1));
buffer.putInt(0);
buffer.putInt((int) duration);
buffer.putLong(bufferId);
buffer.putInt(stacks);
buffer.flip();
return buffer.array();
}
}