From cb1b31131c1a1e35dab99bffe4d5036cdf17a0ea Mon Sep 17 00:00:00 2001 From: Phill310 Date: Sat, 20 Apr 2024 03:45:00 -0700 Subject: [PATCH 1/4] Adds the EndermanAttackPlayer event to skript --- .../skript/classes/data/BukkitEventValues.java | 16 ++++++++++++++++ .../ch/njol/skript/events/SimpleEvents.java | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java index 0bdf15d02c1..34cdf9af6f7 100644 --- a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java +++ b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java @@ -41,6 +41,7 @@ import ch.njol.skript.util.slot.InventorySlot; import ch.njol.skript.util.slot.Slot; import com.destroystokyo.paper.event.block.AnvilDamagedEvent; +import com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent; import com.destroystokyo.paper.event.entity.ProjectileCollideEvent; import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; import io.papermc.paper.event.entity.EntityMoveEvent; @@ -678,6 +679,21 @@ public Entity get(LightningStrikeEvent event) { return event.getLightning(); } }, 0); + // EndermanAttackPlayerEvent + if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) { + EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Entity.class, new Getter() { + @Override + public Entity get(EndermanAttackPlayerEvent event) { + return event.getEntity(); + } + }, EventValues.TIME_NOW); + EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Player.class, new Getter() { + @Override + public Player get(EndermanAttackPlayerEvent event) { + return event.getPlayer(); + } + }, EventValues.TIME_NOW); + } // --- PlayerEvents --- EventValues.registerEventValue(PlayerEvent.class, Player.class, new Getter() { diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index 1e2d6847050..b1bd9c600ae 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -780,6 +780,23 @@ public class SimpleEvents { .since("INSERT VERSION") .requiredPlugins("Spigot 1.19.4+"); } + + if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) { + Skript.registerEvent("Enderman Enrage", SimpleEvent.class, com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent.class, "enderman (enrage|anger)") + .description( + "Called when an enderman gets mad because a player looked at them.", + "Canceling this event makes the enderman thing the player is wearing a pumpkin.", + "Note: This does not stop enderman from targeting the player as a result of getting damaged." + ) + .examples( + "# Stops endermen from getting angry players with the permission \"safeFrom.enderman\"", + "on enderman enrage:", + "\tif player has permission \"safeFrom.enderman\":", + "\t\tcancel event" + ) + .since("INSERT VERSION") + .requiredPlugins("Paper 1.12+"); + } } } From 9adb1fa20090fa6098f85dff5b197ef4f8394f7b Mon Sep 17 00:00:00 2001 From: Phill310 Date: Sat, 20 Apr 2024 09:54:16 -0700 Subject: [PATCH 2/4] Remove version from required plugins Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> --- src/main/java/ch/njol/skript/events/SimpleEvents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index b1bd9c600ae..6ea6fef20fe 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -795,7 +795,7 @@ public class SimpleEvents { "\t\tcancel event" ) .since("INSERT VERSION") - .requiredPlugins("Paper 1.12+"); + .requiredPlugins("Paper"); } } From 56e213d486b5c250fd47531ec1443ab87178b3e5 Mon Sep 17 00:00:00 2001 From: Phill310 Date: Sat, 20 Apr 2024 09:55:45 -0700 Subject: [PATCH 3/4] Simplify event description Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> --- src/main/java/ch/njol/skript/events/SimpleEvents.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java index 6ea6fef20fe..f6db27f32c6 100644 --- a/src/main/java/ch/njol/skript/events/SimpleEvents.java +++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java @@ -785,7 +785,6 @@ public class SimpleEvents { Skript.registerEvent("Enderman Enrage", SimpleEvent.class, com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent.class, "enderman (enrage|anger)") .description( "Called when an enderman gets mad because a player looked at them.", - "Canceling this event makes the enderman thing the player is wearing a pumpkin.", "Note: This does not stop enderman from targeting the player as a result of getting damaged." ) .examples( From 8feb28f3fecc6f18e12944c125804539b06d3881 Mon Sep 17 00:00:00 2001 From: Phill310 Date: Wed, 8 May 2024 12:09:05 -0700 Subject: [PATCH 4/4] Remove redundant event-value registration Co-authored-by: Patrick Miller --- .../java/ch/njol/skript/classes/data/BukkitEventValues.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java index 154ed988ea5..278c429e416 100644 --- a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java +++ b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java @@ -713,12 +713,6 @@ public Entity get(LightningStrikeEvent event) { }, 0); // EndermanAttackPlayerEvent if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) { - EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Entity.class, new Getter() { - @Override - public Entity get(EndermanAttackPlayerEvent event) { - return event.getEntity(); - } - }, EventValues.TIME_NOW); EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Player.class, new Getter() { @Override public Player get(EndermanAttackPlayerEvent event) {