49 lines
2.9 KiB
Diff
49 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Thu, 2 Apr 2020 01:42:39 -0400
|
||
|
|
Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server
|
||
|
|
|
||
|
|
Suspected case would be around the technique used in .stopRiding
|
||
|
|
Stack will identify any causer of this and warn instead of crashing.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
index 6da406c8403797a1cd9276ac06577c3c080a8a22..e6eeca5834a164d87f5b0e564fe6237902edaa6a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
@@ -1501,6 +1501,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
|
||
|
|
protected void addEntity(Entity entity) {
|
||
|
|
org.spigotmc.AsyncCatcher.catchOp("entity track"); // Spigot
|
||
|
|
+ // Paper start - ignore and warn about illegal addEntity calls instead of crashing server
|
||
|
|
+ if (!entity.valid || entity.level != this.level || this.entityMap.containsKey(entity.getId())) {
|
||
|
|
+ new Throwable("[ERROR] Illegal PlayerChunkMap::addEntity for world " + this.level.getWorld().getName()
|
||
|
|
+ + ": " + entity + (this.entityMap.containsKey(entity.getId()) ? " ALREADY CONTAINED (This would have crashed your server)" : ""))
|
||
|
|
+ .printStackTrace();
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
if (!(entity instanceof EnderDragonPart)) {
|
||
|
|
EntityType<?> entitytypes = entity.getType();
|
||
|
|
int i = entitytypes.clientTrackingRange() * 16;
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index c5dc41a3cf499038bd33451a189913cd3978b230..5127bce423a83711cea94e387b3ae7866215ded5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -1525,7 +1525,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- this.getChunkSource().addEntity(entity);
|
||
|
|
+ // this.getChunkProvider().addEntity(entity); // Paper - moved down below valid=true
|
||
|
|
// CraftBukkit start - SPIGOT-5278
|
||
|
|
if (entity instanceof Drowned) {
|
||
|
|
this.navigations.add(((Drowned) entity).waterNavigation);
|
||
|
|
@@ -1536,6 +1536,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
this.navigations.add(((Mob) entity).getNavigation());
|
||
|
|
}
|
||
|
|
entity.valid = true; // CraftBukkit
|
||
|
|
+ this.getChunkSource().addEntity(entity); // Paper - from above to be below valid=true
|
||
|
|
// Paper start - Set origin location when the entity is being added to the world
|
||
|
|
if (entity.origin == null) {
|
||
|
|
entity.origin = entity.getBukkitEntity().getLocation();
|