Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-27 09:42:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix vanilla generation deadlock

Browse Source 
Thanks aikar
This commit is contained in:
Ivan Pekov 2020-09-02 09:31:34 +03:00
parent 1ee37e46e7
commit 337a6f46f3
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PATCHES.md
View File

@ -56,6 +56,7 @@ # Patches
| server | Fix lead fall dmg config | tr7zw | |
| server | Fix recipe crash | Ivan Pekov | |
| server | Fix the dead lagging the server | William Blake Galbreath | |
| server | Fix vanilla generation deadlock | Aikar | |
| server | Giants AI settings | William Blake Galbreath | |
| server | Global Eula file | tr7zw | |
| server | Heavily optimize furnance fuel and recipe lookups | tr7zw | |

19
patches/server/0041-Fix-vanilla-generation-deadlock.patch Normal file
View File

@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 2 Sep 2020 09:26:00 +0300
Subject: [PATCH] Fix vanilla generation deadlock
Comment from ivan: expect this to be dropped when paper ports this
diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
index e9fbeaf309735ea5fcb0c53b8b2485b0c5dd43be..23341b06b3a2bc98829520045308e006afe29f21 100644
--- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
+++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
@@ -379,6 +379,6 @@ public class RegionLimitedWorldAccess implements GeneratorAccessSeed {
@Override
public Stream<? extends StructureStart<?>> a(SectionPosition sectionposition, StructureGenerator<?> structuregenerator) {
- return this.f.a(sectionposition, structuregenerator);
+ return this.f.getStructureManager().a(this).a(sectionposition, structuregenerator); // Yatopia
}
}