From f7915aa21da68477f63b8ed47546c4108e5dc850 Mon Sep 17 00:00:00 2001 From: SirSmurfy2 <82696841+TheAbsolutionism@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:48:06 -0400 Subject: [PATCH] Partial Changes --- .../njol/skript/effects/EffRemoveResourcePack.java | 13 +++++-------- .../skript/sections/EffSecSendResourcePack.java | 5 ----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java b/src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java index d9f4778d41b..ece4010b4b6 100644 --- a/src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java +++ b/src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java @@ -49,7 +49,7 @@ public class EffRemoveResourcePack extends Effect { @Override public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) { pattern = matchedPattern; - if (matchedPattern == 2) { + if (matchedPattern == 1) { id = (Expression) exprs[0]; recipients = (Expression) exprs[1]; } else { @@ -62,11 +62,11 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye @Override protected void execute(Event event) { UUID uuid = null; - if (pattern == 2) { + if (pattern == 1) { try { uuid = UUID.fromString(id.getSingle(event)); } catch (IllegalArgumentException exception) { - Skript.error("Remove Resource Pack UUID failed: " + exception.getLocalizedMessage(), ErrorQuality.SEMANTIC_ERROR); + Skript.error("Remove Resource Pack UUID failed: " + exception.getLocalizedMessage()); } if (uuid == null) { return; @@ -87,12 +87,9 @@ protected void execute(Event event) { @Override public String toString(@Nullable Event event, boolean debug) { - if (pattern == 1) { + if (pattern == 0) return "remove all resource packs from " + recipients.toString(event, debug); - } else if (pattern == 2) { - return "remove resource pack with the uuid " + id.toString(event, debug) + " from " + recipients.toString(event, debug); - } - return "null"; + return "remove resource pack with the uuid " + id.toString(event, debug) + " from " + recipients.toString(event, debug); } } diff --git a/src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java b/src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java index d3264f8d5d7..10d9e1ff9c3 100644 --- a/src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java +++ b/src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java @@ -90,7 +90,6 @@ public void setForce(Boolean force) { return force; } - @Override public @NotNull HandlerList getHandlers() { throw new IllegalStateException(); @@ -102,10 +101,8 @@ public void setForce(Boolean force) { "send [a|the] resource pack [at|from [[the] URL]] %string% to %players%", "send [a|the] resource pack [at|from [[the] URL]] %string% with hash %string% to %players%" ); - } - private @UnknownNullability Expression url; private @UnknownNullability Expression recipients; private @Nullable Trigger trigger; @@ -137,7 +134,6 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye return true; } - @Override protected @Nullable TriggerItem walk(Event event) { debug(event, true); @@ -192,7 +188,6 @@ public boolean init(Expression[] exprs, int matchedPattern, Kleenean isDelaye return super.walk(event, false); } - @Override public String toString(@Nullable Event event, boolean debug) { String result = "send the resource pack from the URL " + url.toString(event, debug);