mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
b170e8cedb
Remove two features added upstream
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From fbe7a5ea13e1cebf44901f7561480ed2e78a06b9 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/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 0c7558f..a494569 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1120,6 +1120,7 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
|
|
entity.valid = true; // CraftBukkit
|
|
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
}
|
|
|
|
protected void c(Entity entity) {
|
|
@@ -1127,6 +1128,7 @@ public abstract class World implements IBlockAccess {
|
|
((IWorldAccess) this.u.get(i)).b(entity);
|
|
}
|
|
|
|
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
|
|
entity.valid = false; // CraftBukkit
|
|
}
|
|
|
|
--
|
|
2.9.2.windows.1
|
|
|