Updated Upstream (CraftBukkit/Spigot)

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:
eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance
989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events
f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving
2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block

Spigot Changes:
9a643a6a Remove DataWatcher Locking
This commit is contained in:
Shane Freeder
2019-07-16 23:09:32 +01:00
parent ac4eba122a
commit 61c0f2d99e
316 changed files with 672 additions and 831 deletions

View File

@@ -9,7 +9,7 @@ object identity checks safely.
Use a simpler optimized hashcode
diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java
index 77b25317aa..be7e10d859 100644
index 77b25317a..be7e10d85 100644
--- a/src/main/java/net/minecraft/server/BlockState.java
+++ b/src/main/java/net/minecraft/server/BlockState.java
@@ -0,0 +0,0 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
@@ -41,7 +41,7 @@ index 77b25317aa..be7e10d859 100644
public int c() {
diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java
index 31cb8ac841..3f085c7d65 100644
index 31cb8ac84..3f085c7d6 100644
--- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
+++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
@@ -0,0 +0,0 @@ public class BlockStateBoolean extends BlockState<Boolean> {
@@ -55,7 +55,7 @@ index 31cb8ac841..3f085c7d65 100644
return true;
} else if (object instanceof BlockStateBoolean && super.equals(object)) {
diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
index 59d86fc66e..82a1fac6f1 100644
index 59d86fc66..82a1fac6f 100644
--- a/src/main/java/net/minecraft/server/BlockStateEnum.java
+++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
@@ -0,0 +0,0 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -69,7 +69,7 @@ index 59d86fc66e..82a1fac6f1 100644
return true;
} else if (object instanceof BlockStateEnum && super.equals(object)) {
diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java
index 6861c2b058..74ef699520 100644
index 6861c2b05..74ef69952 100644
--- a/src/main/java/net/minecraft/server/BlockStateInteger.java
+++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
@@ -0,0 +0,0 @@ public class BlockStateInteger extends BlockState<Integer> {