From 90c2d48fd196b3c1232e45452c26c36395ffbf18 Mon Sep 17 00:00:00 2001 From: Major- Date: Fri, 4 Jul 2014 23:00:45 +0100 Subject: [PATCH] Stop EquipEventHandler breaking the chain when equipping was successful. --- src/org/apollo/game/event/handler/impl/EquipEventHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java b/src/org/apollo/game/event/handler/impl/EquipEventHandler.java index e6e60b4c..3a3d93af 100644 --- a/src/org/apollo/game/event/handler/impl/EquipEventHandler.java +++ b/src/org/apollo/game/event/handler/impl/EquipEventHandler.java @@ -32,6 +32,7 @@ public final class EquipEventHandler extends EventHandler { EquipmentDefinition definition = EquipmentDefinition.lookup(equippingId); if (definition == null) { + // We don't break the chain here or any item option events won't work! return; } @@ -59,7 +60,6 @@ public final class EquipEventHandler extends EventHandler { && (currentlyEquipped == null || currentlyEquipped.getId() == equippingId)) { equipment.set(definition.getSlot(), equipping); inventory.reset(inventorySlot); - ctx.breakHandlerChain(); return; } @@ -94,7 +94,6 @@ public final class EquipEventHandler extends EventHandler { if (previous != null) { inventory.add(previous); } - ctx.breakHandlerChain(); } }