Skip to content

Commit 95db3cd

Browse files
committed
switch to playermodule over simpleevents
1 parent 5ac4b1a commit 95db3cd

2 files changed

Lines changed: 26 additions & 15 deletions

File tree

src/main/java/ch/njol/skript/events/SimpleEvents.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
99
import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
1010
import com.destroystokyo.paper.event.player.PlayerJumpEvent;
11-
import com.destroystokyo.paper.event.player.PlayerPostRespawnEvent;
1211
import com.destroystokyo.paper.event.player.PlayerReadyArrowEvent;
1312
import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
1413
import io.papermc.paper.event.player.*;
@@ -205,20 +204,6 @@ public class SimpleEvents {
205204
.examples("on quit:",
206205
"on disconnect:")
207206
.since("1.0 (simple disconnection)");
208-
Skript.registerEvent("Respawn", SimpleEvent.class, PlayerRespawnEvent.class, "[player] respawn[ing]")
209-
.description("Called when a player respawns via death or entering the end portal in the end. You should prefer this event over the <a href='#death'>death event</a> as the player is technically alive when this event is called.")
210-
.examples("on respawn:")
211-
.since("1.0");
212-
Skript.registerEvent("Post Respawn", SimpleEvent.class, PlayerPostRespawnEvent.class, "after [player] respawn[ing]")
213-
.description("Called after a player respawns via death or entering the end portal in the end. You should prefer this event over the <a href='#respawn'>respawn event</a> if you need to ensure your changes to the player stick after they respawn.")
214-
.examples("after respawn:",
215-
" if respawn location is a bed:",
216-
" broadcast \"%player% respawned at their bed at %respawn location%\"",
217-
" else if respawn location is a respawn anchor:",
218-
" broadcast \"%player% respawned at their anchor at %respawn location%\"",
219-
" else:",
220-
" broadcast \"%player% respawned at %respawn location%\"")
221-
.since("INSERT VERSION");
222207
Skript.registerEvent("Sneak Toggle", SimpleEvent.class, PlayerToggleSneakEvent.class, "[player] toggl(e|ing) sneak", "[player] sneak toggl(e|ing)")
223208
.description("Called when a player starts or stops sneaking. Use <a href='#CondIsSneaking'>is sneaking</a> to get whether the player was sneaking before the event was called.")
224209
.examples("# make players that stop sneaking jump",

src/main/java/org/skriptlang/skript/bukkit/entity/player/PlayerModule.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import ch.njol.skript.Skript;
44
import ch.njol.skript.lang.util.SimpleEvent;
55
import io.papermc.paper.event.player.AsyncChatEvent;
6+
import com.destroystokyo.paper.event.player.PlayerPostRespawnEvent;
7+
import org.bukkit.event.player.PlayerRespawnEvent;
68
import org.skriptlang.skript.addon.AddonModule;
79
import org.skriptlang.skript.addon.HierarchicalAddonModule;
810
import org.skriptlang.skript.addon.SkriptAddon;
@@ -68,6 +70,30 @@ protected void loadSelf(SkriptAddon addon) {
6870
.addPattern("chat")
6971
.addEvent(AsyncChatEvent.class)
7072
.build());
73+
74+
syntaxRegistry.register(BukkitSyntaxInfos.Event.KEY, BukkitSyntaxInfos.Event.builder(SimpleEvent.class, "Player Respawn")
75+
.addDescription("Called when a player respawns via death or entering the end portal in the end. You should prefer this event over the <a href='#death'>death event</a> as the player is technically alive when this event is called.")
76+
.addExample("on respawn:")
77+
.addSince("1.0")
78+
.addPattern("[player] respawn[ing]")
79+
.addEvent(PlayerRespawnEvent.class)
80+
.build());
81+
82+
syntaxRegistry.register(BukkitSyntaxInfos.Event.KEY, BukkitSyntaxInfos.Event.builder(SimpleEvent.class, "After Player Respawn")
83+
.addDescription("Called after a player respawns via death or entering the end portal in the end. You should prefer this event over the <a href='#respawn'>respawn event</a> if you need to ensure your changes to the player stick after they respawn.")
84+
.addExample("""
85+
after respawn:
86+
if respawn location is a bed:
87+
broadcast "%player% respawned at their bed at %respawn location%"
88+
else if respawn location is a respawn anchor:
89+
broadcast "%player% respawned at their anchor at %respawn location%"
90+
else:
91+
broadcast "%player% respawned at %respawn location%"
92+
""")
93+
.addSince("INSERT VERSION")
94+
.addPattern("after [player] respawn[ing]")
95+
.addEvent(PlayerPostRespawnEvent.class)
96+
.build());
7197
}
7298

7399
@Override

0 commit comments

Comments
 (0)