From 5d920292d88583c9b41019faa16563e05d2fb971 Mon Sep 17 00:00:00 2001 From: Seefo Date: Thu, 27 Mar 2014 18:12:17 -0400 Subject: [PATCH] Fixed #265 --- src/protocol/swg/PlayClientEffectObjectMessage.java | 2 +- src/services/combat/CombatService.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/protocol/swg/PlayClientEffectObjectMessage.java b/src/protocol/swg/PlayClientEffectObjectMessage.java index 29d6aecb..54a1705e 100644 --- a/src/protocol/swg/PlayClientEffectObjectMessage.java +++ b/src/protocol/swg/PlayClientEffectObjectMessage.java @@ -46,7 +46,7 @@ public class PlayClientEffectObjectMessage extends SWGMessage { result.putShort((short) 5); result.putInt(0x8855434A); result.put(getAsciiString(effectFile)); - result.putShort((short) 0); + if(!effectFile.startsWith("clienteffect/holoemote_")) result.putShort((short) 0); // Because waverunner is a dweeb result.putLong(objectId); result.put(getAsciiString(commandString)); diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index 6dfab5b8..63b22eed 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -1075,8 +1075,7 @@ public class CombatService implements INetworkDispatch { else if(command.getAttackType() == 0 || command.getAttackType() == 2 || command.getAttackType() == 3) doAreaRevive(medic, target, weapon, command, actionCounter); - sendHealPackets(medic, target, weapon, command, actionCounter); - + //sendHealPackets(medic, target, weapon, command, actionCounter); // Is there a reason this is here (combat log...?) - it causes a player to come back from the dead die again. } private void doSingleTargetRevive(CreatureObject medic, CreatureObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {