aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0794-Player-Entity-Tracking-Events.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0794-Player-Entity-Tracking-Events.patch')
-rw-r--r--patches/server/0794-Player-Entity-Tracking-Events.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/server/0794-Player-Entity-Tracking-Events.patch b/patches/server/0794-Player-Entity-Tracking-Events.patch
new file mode 100644
index 0000000000..8441aa032f
--- /dev/null
+++ b/patches/server/0794-Player-Entity-Tracking-Events.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yannick Lamprecht <[email protected]>
+Date: Wed, 30 Mar 2022 18:16:52 +0200
+Subject: [PATCH] Player Entity Tracking Events
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
+index de19a5ea96fa38621513e970e04d153576f4f6ae..bff776f07bcc7841acc5757c1f53bde1812756c8 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
+@@ -1762,7 +1762,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ // CraftBukkit end
+ if (flag) {
+ if (this.seenBy.add(player.connection)) {
++ // Paper start - entity tracking events
++ if (io.papermc.paper.event.player.PlayerTrackEntityEvent.getHandlerList().getRegisteredListeners().length == 0 || new io.papermc.paper.event.player.PlayerTrackEntityEvent(player.getBukkitEntity(), this.entity.getBukkitEntity()).callEvent()) {
+ this.serverEntity.addPairing(player);
++ }
++ // Paper end - entity tracking events
+ }
+ } else if (this.seenBy.remove(player.connection)) {
+ this.serverEntity.removePairing(player);
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index b49efb6f5f106396894831f28841d5a14d5a8c00..1cb763e6a33d16ecfb5322f9c78115344eef7249 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3853,7 +3853,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+
+ public void startSeenByPlayer(ServerPlayer player) {}
+
+- public void stopSeenByPlayer(ServerPlayer player) {}
++ // Paper start - entity tracking events
++ public void stopSeenByPlayer(ServerPlayer player) {
++ // Since this event cannot be cancelled, we should call it here to catch all "un-tracks"
++ if (io.papermc.paper.event.player.PlayerUntrackEntityEvent.getHandlerList().getRegisteredListeners().length > 0) {
++ new io.papermc.paper.event.player.PlayerUntrackEntityEvent(player.getBukkitEntity(), this.getBukkitEntity()).callEvent();
++ }
++ }
++ // Paper end - entity tracking events
+
+ public float rotate(Rotation rotation) {
+ float f = Mth.wrapDegrees(this.getYRot());