SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-6186: Canceling a CreatureSpawnEvent​ results in a "Unable to summon entity due to duplicate UUIDs" error

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-11-17 13:41:47 +11:00
parent 889488ff73
commit 658c0a284a
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
paper-server/nms-patches/WorldAccess.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/WorldAccess.java
+++ b/net/minecraft/server/WorldAccess.java
@@ -5,6 +5,13 @@
@@ -5,6 +5,12 @@
WorldServer getMinecraftWorld();
default void addAllEntities(Entity entity) {
@@ -9,9 +9,8 @@
+ this.addAllEntities(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
}
+
+ default boolean addAllEntities(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+ default void addAllEntities(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+ entity.cp().forEach((e) -> this.addEntity(e, reason));
+ return !entity.dead;
+ }
+ // CraftBukkit end
}