diff options
| author | Spottedleaf <[email protected]> | 2019-10-20 02:03:39 -0700 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-10-20 10:03:39 +0100 |
| commit | df984898acc79ead4a645c7fd26e3876f62058cc (patch) | |
| tree | 7b546c9afb4ba63e0cfdf57d5dbcb5841d1cd5cf /Spigot-Server-Patches/0066-Add-World-Util-Methods.patch | |
| parent | 9ea1f9ee3da09df66a5ed3e978327615a987ab9a (diff) | |
| download | Paper-df984898acc79ead4a645c7fd26e3876f62058cc.tar.gz Paper-df984898acc79ead4a645c7fd26e3876f62058cc.zip | |
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.
Diffstat (limited to 'Spigot-Server-Patches/0066-Add-World-Util-Methods.patch')
| -rw-r--r-- | Spigot-Server-Patches/0066-Add-World-Util-Methods.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index 997a37f634..0ccb711a26 100644 --- a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From b049e61067c54dcf37d13269adc3c886c08ed1b7 Mon Sep 17 00:00:00 2001 +From 85561da6e86d037f623b9cf78ca338fe3ba56913 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -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 @@ -46,7 +46,7 @@ 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(); @@ -98,5 +98,5 @@ index 4cf31207e0..1388610a7b 100644 return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f(); } -- -2.22.0 +2.22.1 |