diff --git a/gradle.properties b/gradle.properties index 25afbd438..f47f7bdb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.19.2-R0.1-SNAPSHOT mcVersion=1.19.2 -paperRef=425baed78f2f790b78258cfecdd4682773dce5b0 +paperRef=96fdafd9354f1d27d56ccc1cf7276f1552182659 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0009-Add-PlayerEntityTrackEvent.patch b/patches/api/0009-Add-PlayerEntityTrackEvent.patch deleted file mode 100644 index b315dceef..000000000 --- a/patches/api/0009-Add-PlayerEntityTrackEvent.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Sat, 13 Aug 2022 08:33:02 -0500 -Subject: [PATCH] Add PlayerEntityTrackEvent - - -diff --git a/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java -new file mode 100644 -index 0000000000000000000000000000000000000000..0532a7986a8091e82f1fc64b9654be26d6c8ea5e ---- /dev/null -+++ b/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java -@@ -0,0 +1,40 @@ -+package org.bukkit.event.player; -+ -+import org.bukkit.entity.Entity; -+import org.bukkit.entity.Player; -+import org.bukkit.event.HandlerList; -+import org.jetbrains.annotations.NotNull; -+ -+/** -+ * Called when a player tracks an entity. -+ */ -+public class PlayerTrackEntityEvent extends PlayerEvent { -+ private static final HandlerList handlers = new HandlerList(); -+ private final Entity tracked; -+ -+ public PlayerTrackEntityEvent(@NotNull final Player player, @NotNull final Entity tracked) { -+ super(player); -+ this.tracked = tracked; -+ } -+ -+ /** -+ * Gets the entity newly tracked by the Player -+ * -+ * @return Entity the player is now tracking -+ */ -+ @NotNull -+ public Entity getTracked() { -+ return tracked; -+ } -+ -+ @NotNull -+ @Override -+ public HandlerList getHandlers() { -+ return handlers; -+ } -+ -+ @NotNull -+ public static HandlerList getHandlerList() { -+ return handlers; -+ } -+} diff --git a/patches/server/0015-Add-PlayerEntityTrackEvent.patch b/patches/server/0015-Add-PlayerEntityTrackEvent.patch deleted file mode 100644 index 53ada0cdd..000000000 --- a/patches/server/0015-Add-PlayerEntityTrackEvent.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Sat, 13 Aug 2022 08:32:55 -0500 -Subject: [PATCH] Add PlayerEntityTrackEvent - - -diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 8b30e408d12ccabb66f94829879781e88023f271..e4b5c07b4f310832315711885726cfc4c01663c5 100644 ---- a/src/main/java/net/minecraft/server/level/ServerEntity.java -+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java -@@ -355,6 +355,7 @@ public class ServerEntity { - } - } - -+ this.entity.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerTrackEntityEvent(entityplayer.getBukkitEntity().getPlayer(), this.entity.getBukkitEntity())); // Slice - } - - private void sendDirtyEntityData() {