From 090d57ade3a095b9a03e811de0f3789054074ff4 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Mon, 21 Jun 2021 21:17:45 -0700 Subject: [PATCH] fix horse jump event and some 1.17 stuff and some meta --- .../events/entity/HorseJumpsScriptEvent.java | 16 +++++----------- .../commands/player/DebugBlockCommand.java | 2 +- .../handlers/AbstractListenerPlayInImpl.java | 2 +- .../handlers/DenizenNetworkManagerImpl.java | 2 +- .../handlers/DenizenPacketListenerImpl.java | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java index 63168ed964..b9b7230c6c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java @@ -62,19 +62,15 @@ public boolean matches(ScriptPath path) { String arg1 = path.eventArgLowerAt(0); String arg2 = path.eventArgLowerAt(1); String tamed = arg2.equals("jumps") ? arg1 : arg2; - if (!tryEntity(entity, tamed)) { return false; } - - if (path.eventArgLowerAt(2).equals("jumps") && !arg1.equals(CoreUtilities.toLowerCase(color.toString()))) { + if (path.eventArgLowerAt(2).equals("jumps") && (color == null || !arg1.equals(CoreUtilities.toLowerCase(color.toString())))) { return false; } - if (!runInCheck(path, entity.getLocation())) { return false; } - return super.matches(path); } @@ -107,12 +103,10 @@ public ObjectTag getContext(String name) { @EventHandler public void onHorseJumps(HorseJumpEvent event) { - if (event.getEntity() instanceof Horse) { - entity = new EntityTag(event.getEntity()); - color = new ElementTag(((Horse) event.getEntity()).getColor().name()); - this.event = event; - fire(event); - } + entity = new EntityTag(event.getEntity()); + color = event.getEntity() instanceof Horse ? new ElementTag(((Horse) event.getEntity()).getColor().name()) : null; + this.event = event; + fire(event); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java index 6aba166863..0ffc7c7ec4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java @@ -47,7 +47,7 @@ public DebugBlockCommand() { // The underlying color input is a full color value, however the current minecraft client can only render shades between green and gray (ie the red and blue color channels are ignored). // // @Tags - // None. + // None // // @Usage // Use to show a debug block where the player is looking. diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java index 0b00f1d783..0927d432b0 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java @@ -114,7 +114,7 @@ public void send(Packet packet) { public void handlePacketIn(Packet packet) { denizenNetworkManager.packetsReceived++; if (NMSHandler.debugPackets) { - Debug.log("Packet: " + packet.getClass().getCanonicalName() + " sent from " + player.getName()); + Debug.log("Packet: " + packet.getClass().getCanonicalName() + " sent from " + player.getScoreboardName()); } } diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java index ef60e26fc6..ce8c22fb7d 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenNetworkManagerImpl.java @@ -186,7 +186,7 @@ public void send(Packet packet) { @Override public void send(Packet packet, GenericFutureListener> genericfuturelistener) { if (NMSHandler.debugPackets) { - Debug.log("Packet: " + packet.getClass().getCanonicalName() + " sent to " + player.getName()); + Debug.log("Packet: " + packet.getClass().getCanonicalName() + " sent to " + player.getScoreboardName()); } packetsSent++; if (processAttachToForPacket(packet) diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java index cfcc0c5b3b..472c7daa0c 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/impl/network/handlers/DenizenPacketListenerImpl.java @@ -95,7 +95,7 @@ public void handleContainerClick(ServerboundContainerClickPacket packet) { @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { if (NMSHandler.debugPackets) { - Debug.log("Custom packet payload: " + packet.identifier.toString() + " sent from " + player.getName()); + Debug.log("Custom packet payload: " + packet.identifier.toString() + " sent from " + player.getScoreboardName()); } if (packet.identifier.getNamespace().equals("minecraft") && packet.identifier.getPath().equals("brand")) { FriendlyByteBuf newData = new FriendlyByteBuf(packet.data.copy());