Upstream/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2024-11-21 11:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest paper

Browse Source 
Make sure the player chunk loader throws when a double-remove
occurs, as that should not be happening on Folia
This commit is contained in:
Spottedleaf 2023-06-10 14:09:11 -07:00
parent fd838ffbee
commit b886376c26
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -2,7 +2,7 @@ group=dev.folia
version=1.20-R0.1-SNAPSHOT
mcVersion=1.20
paperRef=2ffb704efaf9811b9da286011e9c4b8f682620a9
paperRef=bc3496ea58f8f66c8d0af8ceff317d28f18ab0f6
org.gradle.caching=true
org.gradle.parallel=true

13
patches/server/0003-Threaded-Regions.patch
View File

@ -1733,9 +1733,18 @@ index fccb8d7a99bef076838ebefa233f2f00a1364c30..e822f308315a955d00dcbedfc1b54d22
public static ChunkHolder getUnloadingChunkHolder(final ServerLevel level, final int chunkX, final int chunkZ) {
diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
index a642b02694eb50e21dee1c3dc0bc397c1712c71e..5002bd772473533da2177d609de33bf23161f1c5 100644
index a495d692841c1a6056ca82519ee9b9c66f1ff5cd..5788fc92976c7704bb48dde91b5c9d403abc5cf0 100644
--- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
+++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
@@ -155,7 +155,7 @@ public class RegionizedPlayerChunkLoader {
final PlayerChunkLoaderData loader = player.chunkLoader;
if (loader == null) {
- return;
+ throw new IllegalStateException("Player is already removed from player chunk loader"); // Folia - region threading
}
loader.remove();
@@ -234,7 +234,7 @@ public class RegionizedPlayerChunkLoader {
public void tick() {
TickThread.ensureTickThread("Cannot tick player chunk loader async");
@ -21322,7 +21331,7 @@ index 963a596154091b79ca139af6274aa323518ad1ad..57b11cb78270a8094f772da497ad3264
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index beb70310f2e9657fee89cb4b6a9885712b0116e6..4d176c6ef17012cbcbf0c053a148291d01893c3c 100644
index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..4825a74ce4893dafdb70ae1badf3d2e1930d01a1 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -194,12 +194,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen