From abb861ee1787cb72c3ccaa87d5649b6f25850b5f Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Sun, 5 Jan 2020 11:37:42 -0800 Subject: [PATCH] fix really weird special case of inventory-item-player parsing --- .../denizen/scripts/commands/npc/BreakCommand.java | 6 +++--- .../scripts/containers/core/InventoryScriptContainer.java | 2 +- .../impl/network/handlers/DenizenNetworkManagerImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java index 2b41857051..b4a684d196 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java @@ -44,15 +44,15 @@ public class BreakCommand extends AbstractCommand implements Holdable { // // @Usage // Use to make the npc break a related block. - // - break + // - ~break // // @Usage // Use to make a different NPC break a related block. - // - break <[some_npc]> + // - ~break <[some_npc]> // // @Usage // Use to make a different NPC break a related block and start digging from 5 blocks away. - // - break <[some_npc]> radius:5 + // - ~break <[some_npc]> radius:5 // --> @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptContainer.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptContainer.java index 2bea4a4c4a..9ce9a0c847 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptContainer.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InventoryScriptContainer.java @@ -241,7 +241,7 @@ else if (ItemTag.matches(item)) { ListTag list = ListTag.getListFor(queue.determinations.getObject(0)); if (list != null) { int x = 0; - for (ItemTag item : list.filter(ItemTag.class, this, true)) { + for (ItemTag item : list.filter(ItemTag.class, context, true)) { while (x < filledSlots.length && filledSlots[x]) { x++; } diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/handlers/DenizenNetworkManagerImpl.java index 35a186d53e..b82d1d658e 100644 --- a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/handlers/DenizenNetworkManagerImpl.java +++ b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/impl/network/handlers/DenizenNetworkManagerImpl.java @@ -72,14 +72,14 @@ public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwab } @Override - protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet packet) throws Exception { // TODO: Check mapping update. Previously overrode 'a', and channelRead0 was overriden separately. + protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet packet) throws Exception { + // TODO: Check mapping update. Previously overrode 'a', and channelRead0 was overriden separately. if (oldManager.channel.isOpen()) { try { packet.a(this.packetListener); } catch (Exception e) { // Do nothing - //dB.echoError(e); } } }