core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0084-Entity-AddTo-RemoveFro...

30 lines
1.1 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 16:10:26 +00:00
From 1ca39c0a68a24dba5575712be65b4cbd7502c785 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 16:10:26 +00:00
index 5471528c22..a252e657c3 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 16:10:26 +00:00
@@ -1076,6 +1076,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
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) {
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 16:10:26 +00:00
@@ -1083,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 01:53:17 +00:00
((IWorldAccess) this.v.get(i)).b(entity);
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
}
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
}
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes: a4bdecff SPIGOT-4372: LightningStrikeEvent cause API 34caaf6d SPIGOT-4371: Trident damaged when event cancelled 97315374 SPIGOT-4369: Handle cancelled trident event bf1c8273 SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
2018-09-15 16:10:26 +00:00
2.19.0
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