2022-12-03 23:46:38 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Yannick Lamprecht <yannicklamprecht@live.de>
|
|
|
|
Date: Wed, 30 Mar 2022 18:16:37 +0200
|
|
|
|
Subject: [PATCH] Player Entity Tracking Events
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java
|
|
|
|
new file mode 100644
|
2024-09-30 01:48:34 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0e37c8c94a77f6f1c2c4f5290722ca02d76ab924
|
2022-12-03 23:46:38 +01:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerTrackEntityEvent.java
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -0,0 +1,60 @@
|
2022-12-03 23:46:38 +01:00
|
|
|
+package io.papermc.paper.event.player;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.Entity;
|
|
|
|
+import org.bukkit.entity.Player;
|
2023-08-21 09:38:55 +02:00
|
|
|
+import org.bukkit.event.Cancellable;
|
2022-12-03 23:46:38 +01:00
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.player.PlayerEvent;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-30 01:48:34 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2022-12-03 23:46:38 +01:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Is called when a {@link Player} tracks an {@link Entity}.
|
2023-08-21 09:38:55 +02:00
|
|
|
+ * <p>
|
|
|
|
+ * If cancelled entity is not shown to the player and interaction in both directions is not possible.
|
2024-01-04 05:57:49 +01:00
|
|
|
+ * <p>
|
|
|
|
+ * Adding or removing entities from the world at the point in time this event is called is completely
|
|
|
|
+ * unsupported and should be avoided.
|
2022-12-03 23:46:38 +01:00
|
|
|
+ */
|
2024-09-30 01:48:34 +02:00
|
|
|
+@NullMarked
|
2023-08-21 09:38:55 +02:00
|
|
|
+public class PlayerTrackEntityEvent extends PlayerEvent implements Cancellable {
|
2022-12-03 23:46:38 +01:00
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
2022-12-03 23:46:38 +01:00
|
|
|
+ private final Entity entity;
|
2023-08-21 09:38:55 +02:00
|
|
|
+ private boolean cancelled;
|
2022-12-03 23:46:38 +01:00
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @ApiStatus.Internal
|
2024-09-30 01:48:34 +02:00
|
|
|
+ public PlayerTrackEntityEvent(final Player player, final Entity entity) {
|
2022-12-03 23:46:38 +01:00
|
|
|
+ super(player);
|
|
|
|
+ this.entity = entity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the entity that will be tracked
|
|
|
|
+ *
|
|
|
|
+ * @return the entity tracked
|
|
|
|
+ */
|
|
|
|
+ public Entity getEntity() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.entity;
|
2022-12-03 23:46:38 +01:00
|
|
|
+ }
|
2023-08-21 09:38:55 +02:00
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.cancelled;
|
2023-08-21 09:38:55 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
2024-09-30 01:48:34 +02:00
|
|
|
+ public void setCancelled(final boolean cancel) {
|
2023-08-21 09:38:55 +02:00
|
|
|
+ this.cancelled = cancel;
|
|
|
|
+ }
|
2024-02-01 10:15:57 +01:00
|
|
|
+
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
2022-12-03 23:46:38 +01:00
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java
|
|
|
|
new file mode 100644
|
2024-09-30 01:48:34 +02:00
|
|
|
index 0000000000000000000000000000000000000000..30e01ffc8b0d4a8e43a046d85f1903cc20e0e84d
|
2022-12-03 23:46:38 +01:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerUntrackEntityEvent.java
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -0,0 +1,46 @@
|
2022-12-03 23:46:38 +01:00
|
|
|
+package io.papermc.paper.event.player;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.Entity;
|
|
|
|
+import org.bukkit.entity.Player;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.player.PlayerEvent;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-30 01:48:34 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2022-12-03 23:46:38 +01:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Is called when a {@link Player} untracks an {@link Entity}.
|
2024-01-04 05:57:49 +01:00
|
|
|
+ * <p>
|
|
|
|
+ * Adding or removing entities from the world at the point in time this event is called is completely
|
|
|
|
+ * unsupported and should be avoided.
|
2022-12-03 23:46:38 +01:00
|
|
|
+ */
|
2024-09-30 01:48:34 +02:00
|
|
|
+@NullMarked
|
2022-12-03 23:46:38 +01:00
|
|
|
+public class PlayerUntrackEntityEvent extends PlayerEvent {
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
2022-12-03 23:46:38 +01:00
|
|
|
+ private final Entity entity;
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @ApiStatus.Internal
|
2024-09-30 01:48:34 +02:00
|
|
|
+ public PlayerUntrackEntityEvent(final Player player, final Entity entity) {
|
2022-12-03 23:46:38 +01:00
|
|
|
+ super(player);
|
|
|
|
+ this.entity = entity;
|
|
|
|
+ }
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ /**
|
|
|
|
+ * Gets the entity that will be untracked
|
|
|
|
+ *
|
|
|
|
+ * @return the entity untracked
|
|
|
|
+ */
|
|
|
|
+ public Entity getEntity() {
|
|
|
|
+ return this.entity;
|
2022-12-03 23:46:38 +01:00
|
|
|
+ }
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return HANDLER_LIST;
|
2022-12-03 23:46:38 +01:00
|
|
|
+ }
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return HANDLER_LIST;
|
2022-12-03 23:46:38 +01:00
|
|
|
+ }
|
|
|
|
+}
|