Paper/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch

25 lines
1.2 KiB
Diff
Raw Normal View History

From 166a5a9e1a03057324fe82d5aa496a783c509bea Mon Sep 17 00:00:00 2001
2019-04-27 08:26:04 +02:00
From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues
Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d69ad6820b..f03804bfbb 100644
2019-04-27 08:26:04 +02:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2019-05-14 04:20:58 +02:00
@@ -928,6 +928,7 @@ public class WorldServer extends World {
2019-04-27 08:26:04 +02:00
// CraftBukkit start
private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
+ if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
if (entity.dead) {
// WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
return false;
--
2.21.0