mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 13:36:44 +01:00
2873869bb1
Signs no longer have a specific isEdiable state, the entire API in this regard needs updating/deprecation. The boolean field is completely gone, replaced by a uuid (which will need a new setEditingPlayer(UUID) method on the Sign interface), and the current upstream implementation of setEdiable simply flips the is_waxed state. This patch is hence not needed as it neither allows editing (which will be redone in a later patch) nor is required to copy the is_waxed boolean flag as it lives in the signs compound tag and is covered by applyTo.
91 lines
4.2 KiB
Diff
91 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 29 May 2020 20:29:02 -0400
|
|
Subject: [PATCH] Synchronize PalettedContainer instead of
|
|
ThreadingDetector/Semaphore
|
|
|
|
Mojang has flaws in their logic about chunks being concurrently
|
|
wrote to. So we constantly see crashes around multiple threads writing.
|
|
|
|
Additionally, java has optimized synchronization so well that its
|
|
in many times faster than trying to manage read write locks for low
|
|
contention situations.
|
|
|
|
And this is extremely a low contention situation.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
|
index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c30fb1a9cf 100644
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
|
|
@@ -31,14 +31,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
public final IdMap<T> registry;
|
|
private volatile PalettedContainer.Data<T> data;
|
|
private final PalettedContainer.Strategy strategy;
|
|
- private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer");
|
|
+ // private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer"); // Paper - unused
|
|
|
|
public void acquire() {
|
|
- this.threadingDetector.checkAndLock();
|
|
+ // this.threadingDetector.checkAndLock(); // Paper - disable this - use proper synchronization
|
|
}
|
|
|
|
public void release() {
|
|
- this.threadingDetector.checkAndUnlock();
|
|
+ // this.threadingDetector.checkAndUnlock(); // Paper - disable this
|
|
}
|
|
|
|
public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
|
|
@@ -90,7 +90,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
}
|
|
|
|
@Override
|
|
- public int onResize(int newBits, T object) {
|
|
+ public synchronized int onResize(int newBits, T object) { // Paper - synchronize
|
|
PalettedContainer.Data<T> data = this.data;
|
|
PalettedContainer.Data<T> data2 = this.createOrReuseData(data, newBits);
|
|
data2.copyFrom(data.palette, data.storage);
|
|
@@ -115,7 +115,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
return this.getAndSet(this.strategy.getIndex(x, y, z), value);
|
|
}
|
|
|
|
- private T getAndSet(int index, T value) {
|
|
+ private synchronized T getAndSet(int index, T value) { // Paper - synchronize
|
|
int i = this.data.palette.idFor(value);
|
|
int j = this.data.storage.getAndSet(index, i);
|
|
return this.data.palette.valueFor(j);
|
|
@@ -132,7 +132,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
|
|
}
|
|
|
|
- private void set(int index, T value) {
|
|
+ private synchronized void set(int index, T value) { // Paper - synchronize
|
|
int i = this.data.palette.idFor(value);
|
|
this.data.storage.set(index, i);
|
|
}
|
|
@@ -157,7 +157,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
});
|
|
}
|
|
|
|
- public void read(FriendlyByteBuf buf) {
|
|
+ public synchronized void read(FriendlyByteBuf buf) { // Paper - synchronize
|
|
this.acquire();
|
|
|
|
try {
|
|
@@ -173,7 +173,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
}
|
|
|
|
@Override
|
|
- public void write(FriendlyByteBuf buf) {
|
|
+ public synchronized void write(FriendlyByteBuf buf) { // Paper - synchronize
|
|
this.acquire();
|
|
|
|
try {
|
|
@@ -228,7 +228,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
|
|
}
|
|
|
|
@Override
|
|
- public PalettedContainerRO.PackedData<T> pack(IdMap<T> idList, PalettedContainer.Strategy paletteProvider) {
|
|
+ public synchronized PalettedContainerRO.PackedData<T> pack(IdMap<T> idList, PalettedContainer.Strategy paletteProvider) { // Paper - synchronize
|
|
this.acquire();
|
|
|
|
PalettedContainerRO.PackedData var12;
|