geforkt von Mirrors/Paper
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
32 Zeilen
1.1 KiB
Diff
32 Zeilen
1.1 KiB
Diff
From 2a263f5083a6f68a1411638b82d48cddf7c608e4 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 7 Jan 2017 15:41:58 -0500
|
|
Subject: [PATCH] Enforce Sync Player Saves
|
|
|
|
Saving players async is extremely dangerous. This will force it to main
|
|
the same way we handle async chunk loads.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 7d778ff3e0..06ce2af1e6 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -1215,6 +1215,7 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
public void savePlayers(Integer interval) {
|
|
+ MCUtil.ensureMain("Save Players", () -> { // Paper - ensure main
|
|
long now = MinecraftServer.currentTick;
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
|
int numSaved = 0; // Paper
|
|
@@ -1226,6 +1227,7 @@ public abstract class PlayerList {
|
|
}
|
|
}
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
+ return null; }); // Paper - ensure main
|
|
}
|
|
// Paper end
|
|
|
|
--
|
|
2.19.0
|
|
|