Skip to content

Commit 7b7a7ef

Browse files
committed
Make sure to invoke TicketStorage#activateAllDeactivatedTickets
We avoided it as it used the chunk tracker, but really we need to invoke this so that force loaded chunks persist properly ( and other persistant ticket types).
1 parent dc993f6 commit 7b7a7ef

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8077,7 +8077,7 @@ index 42d2f82b24ae48471bfc091667f8e84c5b0d62a8..ab80a66646a7ebe2862221ac342b06c1
80778077
}
80788078
}
80798079
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8080-
index aa4d7c102c0952c35e6068dfa7f29e2fe52a43b2..aa2c7732749400ffaf6c0e3ff17b698959bfd5f4 100644
8080+
index aa4d7c102c0952c35e6068dfa7f29e2fe52a43b2..b68e0220b3a2850f6a10578c0784decdc0cdef18 100644
80818081
--- a/net/minecraft/server/MinecraftServer.java
80828082
+++ b/net/minecraft/server/MinecraftServer.java
80838083
@@ -196,7 +196,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -8257,16 +8257,21 @@ index aa4d7c102c0952c35e6068dfa7f29e2fe52a43b2..aa2c7732749400ffaf6c0e3ff17b6989
82578257
level.registryAccess()
82588258
.lookup(Registries.CONFIGURED_FEATURE)
82598259
.flatMap(registry -> registry.get(MiscOverworldFeatures.BONUS_CHEST))
8260-
@@ -895,7 +928,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
8261-
// CraftBukkit end
8260+
@@ -896,19 +929,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
82628261
ChunkLoadCounter chunkLoadCounter = new ChunkLoadCounter();
82638262

8264-
- if (true) { // CraftBukkit
8265-
+ if (false) { // CraftBukkit // Folia - region threading
8266-
chunkLoadCounter.track(serverLevel, () -> {
8263+
if (true) { // CraftBukkit
8264+
- chunkLoadCounter.track(serverLevel, () -> {
8265+
+ //chunkLoadCounter.track(serverLevel, () -> { // Folia - region threading
82678266
TicketStorage ticketStorage = serverLevel.getDataStorage().get(TicketStorage.TYPE);
82688267
if (ticketStorage != null) {
8269-
@@ -908,7 +941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
8268+
ticketStorage.activateAllDeactivatedTickets();
8269+
}
8270+
- });
8271+
+ //}); // Folia - region threading
8272+
}
8273+
8274+
serverLevel.levelLoadListener.start(LevelLoadListener.Stage.LOAD_INITIAL_CHUNKS, chunkLoadCounter.totalChunks()); // Paper - per world load listener
82708275

82718276
do {
82728277
serverLevel.levelLoadListener.update(LevelLoadListener.Stage.LOAD_INITIAL_CHUNKS, chunkLoadCounter.readyChunks(), chunkLoadCounter.totalChunks()); // Paper - per world load listener
@@ -13507,7 +13512,7 @@ index 6838b8d5c0d046a7db8a88534edc430d79d6c628..62b33d404a20c42eac557eb39188ae07
1350713512
date = defaultValue;
1350813513
}
1350913514
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
13510-
index 9f86d1fc4ea4c6987fa207644573565aea7edead..343d647ce6842b80017a7c8b97b66ec57cab68a4 100644
13515+
index 989ac565c47a70c7947cb7315d0f5c2cfecd0363..e0654190600925b912703e026cc716864f0741fd 100644
1351113516
--- a/net/minecraft/server/players/PlayerList.java
1351213517
+++ b/net/minecraft/server/players/PlayerList.java
1351313518
@@ -112,10 +112,10 @@ public abstract class PlayerList {

0 commit comments

Comments
 (0)