Update to 1.14.4 (#2333)

This commit is contained in:
Spottedleaf
2019-07-19 21:01:24 -07:00
parent e1fb590ee6
commit f01c2b2b7c
326 changed files with 1249 additions and 1283 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
new file mode 100644
index 000000000..a3b174618
index 0000000000..a3b174618d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
@@ -0,0 +0,0 @@
@@ -22,7 +22,7 @@ index 000000000..a3b174618
+ }
+}
diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
index 28a6be7ab..e05b9d606 100644
index a3bb2e8779..1e2bca1e04 100644
--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -0,0 +0,0 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {