mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
papermc/Spigot-Server-Patches/0107-Entity-AddTo-RemoveFrom-World-Events.patch

30 lines
1.1 KiB
Diff
Raw Normal View History

Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
From 6a7f3beb5deb1e84b02189832d3db4bc8fbc2161 Mon Sep 17 00:00:00 2001
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
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
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
index 757ed3e..095d4b2 100644
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
@@ -1107,6 +1107,7 @@ public abstract class World implements IBlockAccess {
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
}
entity.valid = true; // CraftBukkit
And AddTo is a different event than RemoveFrom
2016-03-29 00:58:42 +00:00
+ new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
}
protected void c(Entity entity) {
Refactor Lighting Queue System may help #284 Cleans up the lighting queue system, reducing diff and improving implementation. We no longer stop chunk unloads due to lighting updates, and instead simply flush the lighting queue. The cost of forcing the chunk (and its neighbors!) to stay loaded waiting for its lighting work to finish is much greater than simply taking the hit and doing the work. This change also helps reduce the diff and avoid bugs with missed diffs by removing duplicated logic. Also switches to a more effecient data structure (ArrayDeque instead of LinkedList) for the queue itself.
2016-05-15 22:48:39 +00:00
@@ -1114,6 +1115,7 @@ public abstract class World implements IBlockAccess {
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
((IWorldAccess) this.u.get(i)).b(entity);
}
Actually fire those events
2016-03-29 00:57:15 +00:00
+ new com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
entity.valid = false; // CraftBukkit
}
--
Paper 1.9.4 Update
2016-05-12 02:07:46 +00:00
2.8.2
Entity AddTo/RemoveFrom World Events These events will give plugins a reliable way to track every entity that is added or removed from a world, so that one may always ensure they are in a desired state.
2016-03-29 00:33:10 +00:00
Reference in a new issue Copy permalink