mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:7554e08e
Add UUID support to CraftProfileBanList3fe37460
SPIGOT-5378: Fix TileEntity fixer deadlock12386dd4
SPIGOT-5375: Add spaces to coordinates from tile fixer606c19e2
SPIGOT-5373: Simultaneous left+right click in creative mode does not work13caf848
SPIGOT-5370: Fix Block#rayTrace considering other blocks.
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 2db5f37a634e2d54cf102d794fa1628bcf79f4a3 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 28 Mar 2016 20:32:58 -0400
|
|
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index dfb8a70a2c..835428e839 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1124,7 +1124,7 @@ public class WorldServer extends World {
|
|
if (entity instanceof EntityInsentient) {
|
|
this.H.remove(((EntityInsentient) entity).getNavigation());
|
|
}
|
|
-
|
|
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
entity.valid = false; // CraftBukkit
|
|
}
|
|
|
|
@@ -1162,6 +1162,7 @@ public class WorldServer extends World {
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|
|
}
|
|
// Paper end
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
}
|
|
|
|
}
|
|
--
|
|
2.22.1
|
|
|