Fix server deadlock when loading some chunks (#2647)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7554e08e Add UUID support to CraftProfileBanList 3fe37460 SPIGOT-5378: Fix TileEntity fixer deadlock 12386dd4 SPIGOT-5375: Add spaces to coordinates from tile fixer 606c19e2 SPIGOT-5373: Simultaneous left+right click in creative mode does not work 13caf848 SPIGOT-5370: Fix Block#rayTrace considering other blocks.
This commit is contained in:
@@ -18,13 +18,13 @@ index 6c13ae3bae..77d6d5e6eb 100644
|
||||
return this.a(blockposition, i, this.world.getWorldProvider().g());
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 6e7f72a1a4..b1a3717d30 100644
|
||||
index ce723c62e1..ea5905817a 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||
protected final java.util.Set<TileEntity> tileEntityListUnload = com.google.common.collect.Sets.newHashSet(); // Paper
|
||||
private final long b = 16777215L;
|
||||
private final Thread serverThread;
|
||||
final Thread serverThread; // CraftBukkit - package private
|
||||
- private int u;
|
||||
+ private int u; public int getSkylightSubtracted() { return this.u; } public void setSkylightSubtracted(int value) { this.u = value;} // Paper - OBFHELPER
|
||||
protected int i = (new Random()).nextInt();
|
||||
|
||||
Reference in New Issue
Block a user