2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 00:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop EquipEventHandler breaking the chain when equipping was successful.

Browse Source
This commit is contained in:
Major-
2014-07-04 23:00:45 +01:00
parent e0f6e8618b
commit 90c2d48fd1
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/game/event/handler/impl/EquipEventHandler.java
+1 -2
View File
@@ -32,6 +32,7 @@ public final class EquipEventHandler extends EventHandler<ItemOptionEvent> {
EquipmentDefinition definition = EquipmentDefinition.lookup(equippingId); EquipmentDefinition definition = EquipmentDefinition.lookup(equippingId);
if (definition == null) { if (definition == null) {
// We don't break the chain here or any item option events won't work!
return; return;
} }
@@ -59,7 +60,6 @@ public final class EquipEventHandler extends EventHandler<ItemOptionEvent> {
&& (currentlyEquipped == null || currentlyEquipped.getId() == equippingId)) { && (currentlyEquipped == null || currentlyEquipped.getId() == equippingId)) {
equipment.set(definition.getSlot(), equipping); equipment.set(definition.getSlot(), equipping);
inventory.reset(inventorySlot); inventory.reset(inventorySlot);
ctx.breakHandlerChain();
return; return;
} }
@@ -94,7 +94,6 @@ public final class EquipEventHandler extends EventHandler<ItemOptionEvent> {
if (previous != null) { if (previous != null) {
inventory.add(previous); inventory.add(previous);
} }
ctx.breakHandlerChain();
} }
} }