From b0a4204a495fbe89f22f7e1d47627d39e19d6ea9 Mon Sep 17 00:00:00 2001 From: Seefo Date: Wed, 16 Apr 2014 13:27:12 -0400 Subject: [PATCH] Fixed an issue where saber reflect would not be granted upon speccing it in expertise - fixed a vehicle radial bug --- scripts/expertise/expertise_fs_path_saber_reflect_1.py | 4 ++-- scripts/radial/vehicle.py | 2 +- src/services/BuffService.java | 3 +++ src/services/SimulationService.java | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/expertise/expertise_fs_path_saber_reflect_1.py b/scripts/expertise/expertise_fs_path_saber_reflect_1.py index 8a78f62b..ff019b2d 100644 --- a/scripts/expertise/expertise_fs_path_saber_reflect_1.py +++ b/scripts/expertise/expertise_fs_path_saber_reflect_1.py @@ -1,9 +1,9 @@ import sys def addAbilities(core, actor, player): - actor.addAbility("fs_saber_reflect") + actor.addAbility("fs_saber_reflect_buff") return def removeAbilities(core, actor, player): - actor.removeAbility("fs_saber_reflect") + actor.removeAbility("fs_saber_reflect_buff") return diff --git a/scripts/radial/vehicle.py b/scripts/radial/vehicle.py index 2cf9f19b..9c5a8e96 100644 --- a/scripts/radial/vehicle.py +++ b/scripts/radial/vehicle.py @@ -23,7 +23,7 @@ def handleSelection(core, owner, target, option): target.unmount(owner) if option == 60: - if owner.isMounted(): vehicleObject.unmount(owner) + if owner.isMounted(): target.unmount(owner) core.objectService.destroyObject(target) owner.setAttachment('activeVehicleID', None) return \ No newline at end of file diff --git a/src/services/BuffService.java b/src/services/BuffService.java index 36a0154f..71f44a0d 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -88,6 +88,9 @@ public class BuffService implements INetworkDispatch { }*/ Buff buff = buffMap.get(buffName); + + if(buff == null) return false; + if(buff.isGroupBuff()) { addGroupBuff(buffer, buffName, buffer); return true; diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 67406a06..36ae2775 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -763,7 +763,6 @@ public class SimulationService implements INetworkDispatch { core.combatService.handleEndDuel(object, opponent, true); } } - System.out.print(object.getAttachment("activeVehicleID")); if(object.getAttachment("activeVehicleID") != null) {