From ea417cb7a54802f3fa7fcd17c3651a8a3f2c88c6 Mon Sep 17 00:00:00 2001 From: Treeku Date: Thu, 28 Aug 2014 07:36:33 +0100 Subject: [PATCH] Cleaned up Buff object --- src/resources/buffs/Buff.java | 48 +++++++++++------------------------ 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/src/resources/buffs/Buff.java b/src/resources/buffs/Buff.java index a1b3a547..4c76c025 100644 --- a/src/resources/buffs/Buff.java +++ b/src/resources/buffs/Buff.java @@ -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(); } }