mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
MC-134668: Remove bad synchronized block from FileIOThread
This is causing the main thread to be blocked still.
This commit is contained in:
parent
c677a1e520
commit
ffd9c77923
@ -1,4 +1,4 @@
|
|||||||
From 0d3a01c3188c4dbdccdb1b700707e790777a5968 Mon Sep 17 00:00:00 2001
|
From 5cf50182ea6201707d4281655d44182f4272fd8f Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 4 Mar 2016 18:18:37 -0600
|
Date: Fri, 4 Mar 2016 18:18:37 -0600
|
||||||
Subject: [PATCH] Chunk save queue improvements
|
Subject: [PATCH] Chunk save queue improvements
|
||||||
@ -137,10 +137,21 @@ index f969c036f3..2b0a088a6a 100644
|
|||||||
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) dataoutputstream);
|
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) dataoutputstream);
|
||||||
dataoutputstream.close();
|
dataoutputstream.close();
|
||||||
diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
|
diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
|
||||||
index 8c3537ab8d..170c239b77 100644
|
index 8c3537ab8d..3c688f546c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/FileIOThread.java
|
--- a/src/main/java/net/minecraft/server/FileIOThread.java
|
||||||
+++ b/src/main/java/net/minecraft/server/FileIOThread.java
|
+++ b/src/main/java/net/minecraft/server/FileIOThread.java
|
||||||
@@ -47,11 +47,12 @@ public class FileIOThread implements Runnable {
|
@@ -38,20 +38,21 @@ public class FileIOThread implements Runnable {
|
||||||
|
IAsyncChunkSaver iasyncchunksaver = (IAsyncChunkSaver) this.c.get(i);
|
||||||
|
boolean flag;
|
||||||
|
|
||||||
|
- synchronized (iasyncchunksaver) {
|
||||||
|
+ //synchronized (iasyncchunksaver) { // Paper - remove synchronized
|
||||||
|
flag = iasyncchunksaver.a();
|
||||||
|
- }
|
||||||
|
+ //} // Paper
|
||||||
|
|
||||||
|
if (!flag) {
|
||||||
|
this.c.remove(i--);
|
||||||
++this.e;
|
++this.e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user