2020-05-01 22:03:47 +00:00
|
|
|
From 97238d4fbd5f5e6a5da9f051e50751ff70c76dcb Mon Sep 17 00:00:00 2001
|
2020-04-02 05:45:33 +00:00
|
|
|
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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
2020-05-01 22:03:47 +00:00
|
|
|
index 8f477767b9..7647b804fa 100644
|
2020-04-02 05:45:33 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 03:47:29 +00:00
|
|
|
@@ -1489,6 +1489,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
2020-04-02 05:45:33 +00:00
|
|
|
|
|
|
|
|
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.world != this.world || this.trackedEntities.containsKey(entity.getId())) {
|
|
|
|
|
+ new Throwable("[ERROR] Illegal PlayerChunkMap::addEntity for world " + this.world.getWorld().getName()
|
|
|
|
|
+ + ": " + entity + (this.trackedEntities.containsKey(entity.getId()) ? " ALREADY CONTAINED (This would have crashed your server)" : ""))
|
|
|
|
|
+ .printStackTrace();
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ // Paper end
|
|
|
|
|
if (!(entity instanceof EntityComplexPart)) {
|
|
|
|
|
if (!(entity instanceof EntityLightning)) {
|
|
|
|
|
EntityTypes<?> entitytypes = entity.getEntityType();
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-04-26 08:01:03 +00:00
|
|
|
index 3f8f40018d..532aba2a5d 100644
|
2020-04-02 05:45:33 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-04-26 08:01:03 +00:00
|
|
|
@@ -1474,7 +1474,7 @@ public class WorldServer extends World {
|
2020-04-02 05:45:33 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- this.getChunkProvider().addEntity(entity);
|
|
|
|
|
+ // this.getChunkProvider().addEntity(entity); // Paper - moved down below valid=true
|
|
|
|
|
// CraftBukkit start - SPIGOT-5278
|
|
|
|
|
if (entity instanceof EntityDrowned) {
|
|
|
|
|
this.navigators.add(((EntityDrowned) entity).navigationWater);
|
2020-04-26 08:01:03 +00:00
|
|
|
@@ -1485,6 +1485,7 @@ public class WorldServer extends World {
|
2020-04-02 05:45:33 +00:00
|
|
|
this.navigators.add(((EntityInsentient) entity).getNavigation());
|
|
|
|
|
}
|
|
|
|
|
entity.valid = true; // CraftBukkit
|
|
|
|
|
+ this.getChunkProvider().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();
|
|
|
|
|
--
|
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 03:47:29 +00:00
|
|
|
2.26.2
|
2020-04-02 05:45:33 +00:00
|
|
|
|