SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, #1008: Add EntityRemoveEvent

By: DerFrZocker <derrieple@gmail.com>
2024-02-21 20:55:34 +11:00
parent 6dc11b5d28
commit 64cd2b148a
81 changed files with 2037 additions and 475 deletions
--- a/paper-server/nms-patches/net/minecraft/util/SpawnUtil.patch
+++ b/paper-server/nms-patches/net/minecraft/util/SpawnUtil.patch
@@ -13,7 +13,7 @@
         BlockPosition.MutableBlockPosition blockposition_mutableblockposition = blockposition.mutable();
 
         for (int l = 0; l < i; ++l) {
-@@ -29,11 +35,11 @@
+@@ -29,15 +35,15 @@
 
             blockposition_mutableblockposition.setWithOffset(blockposition, i1, k, j1);
             if (worldserver.getWorldBorder().isWithinBounds((BlockPosition) blockposition_mutableblockposition) && moveToPossibleSpawnPosition(worldserver, k, blockposition_mutableblockposition, spawnutil_a)) {
@@ -27,3 +27,8 @@
                         return Optional.of(t0);
                     }
 
+-                    t0.discard();
+                    t0.discard(null); // CraftBukkit - add Bukkit remove cause
+                 }
+             }
+         }