2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-12 03:31:40 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 11 Apr 2020 21:23:42 -0400
|
|
|
|
Subject: [PATCH] Delay unsafe actions until after entity ticking is done
|
|
|
|
|
|
|
|
This will help prevent many cases of unregistering entities during entity ticking
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
2020-06-23 10:30:45 +02:00
|
|
|
index 69e6614049e490dc70baf745761c62b173cf693e..aaf85a1497de98522e3a01d4f81a267c4b0cc087 100644
|
2020-04-12 03:31:40 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
|
|
@@ -60,6 +60,16 @@ public class WorldServer extends World {
|
|
|
|
private final Queue<Entity> entitiesToAdd = Queues.newArrayDeque();
|
|
|
|
public final List<EntityPlayer> players = Lists.newArrayList(); // Paper - private -> public
|
|
|
|
boolean tickingEntities;
|
|
|
|
+ // Paper start
|
|
|
|
+ List<java.lang.Runnable> afterEntityTickingTasks = Lists.newArrayList();
|
|
|
|
+ public void doIfNotEntityTicking(java.lang.Runnable run) {
|
|
|
|
+ if (tickingEntities) {
|
|
|
|
+ afterEntityTickingTasks.add(run);
|
|
|
|
+ } else {
|
|
|
|
+ run.run();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
private final MinecraftServer server;
|
|
|
|
private final WorldNBTStorage dataManager;
|
|
|
|
public boolean savingDisabled;
|
2020-04-26 10:01:03 +02:00
|
|
|
@@ -531,6 +541,16 @@ public class WorldServer extends World {
|
2020-04-12 03:31:40 +02:00
|
|
|
timings.entityTick.stopTiming(); // Spigot
|
|
|
|
|
|
|
|
this.tickingEntities = false;
|
|
|
|
+ // Paper start
|
|
|
|
+ for (java.lang.Runnable run : this.afterEntityTickingTasks) {
|
|
|
|
+ try {
|
|
|
|
+ run.run();
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ LOGGER.error("Error in After Entity Ticking Task", e);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ this.afterEntityTickingTasks.clear();
|
|
|
|
+ // Paper end
|
|
|
|
this.getMinecraftServer().midTickLoadChunks(); // Paper
|
|
|
|
|
|
|
|
try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings
|