From 2d24e8d8ae3215827299eedbaa561a1d6b9b3448 Mon Sep 17 00:00:00 2001 From: wallaceg09 Date: Sat, 8 Nov 2014 09:44:57 -0600 Subject: [PATCH 1/2] FIXED server crash when a player stops performing. --- src/resources/objects/creature/CreatureObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 6d12b33a..be310f6f 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -367,8 +367,8 @@ public class CreatureObject extends TangibleObject implements IPersistent { } if (getPosture() == resources.datatables.Posture.SkillAnimating) { - //stopPerformance(); - NGECore.getInstance().entertainmentService.stopPerformance(this); + stopPerformance(); + //NGECore.getInstance().entertainmentService.stopPerformance(this);//FIXME: Maximum recursion. } if (getPosture() == posture) { From 0f296ea96d44506b39913cade85cca84682ef212 Mon Sep 17 00:00:00 2001 From: Undercova Date: Sat, 8 Nov 2014 23:06:18 +0100 Subject: [PATCH 2/2] Update character_builder_terminal.py --- scripts/character_builder_terminal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/character_builder_terminal.py b/scripts/character_builder_terminal.py index 78901ad4..34fd20c0 100644 --- a/scripts/character_builder_terminal.py +++ b/scripts/character_builder_terminal.py @@ -305,7 +305,7 @@ def miscHandler(owner): returnList = Vector() returnList.add('List.lstList:SelectedRow') window.addHandler(0, '', Trigger.TRIGGER_OK, returnList, miscHandlerCallback) - window.addListBoxMenuItem('Backpack', 0) + window.addListBoxMenuItem('Instrument', 0) window.addListBoxMenuItem('Heroism Jewelry Set', 1) window.addListBoxMenuItem('Belt of Master Bodo Baas', 2) window.addListBoxMenuItem('Starter Equipment Box', 3) @@ -321,7 +321,7 @@ def miscHandlerCallback(owner, window, eventType, returnList): return if returnList.get(0)=='0': - backpack(owner, inventory) + instrument(owner, inventory) return if returnList.get(0)=='1': heroismJewelry(owner, inventory) @@ -1347,8 +1347,8 @@ def jediBelt(owner, inventory): screenOne(core, owner) return -def backpack(owner, inventory): - # inventory.add(core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_s01.iff", owner.getPlanet())) +def instrument(owner, inventory): + inventory.add(core.objectService.createObject("object/tangible/instrument/shared_slitherhorn.iff", owner.getPlanet())) screenOne(core, owner) return