Updated Upstream (Bukkit/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

Bukkit Changes:
3dc4cdcd Update to Minecraft 1.14.3-pre4
88b25a8c SPIGOT-5098: Add a method to allow colored sign changes
6d913552 Update to Minecraft 1.14.3-pre4

CraftBukkit Changes:
f1f33559 Update to Minecraft 1.14.3
8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes
533290e2 SPIGOT-5100: Console warning from pig zombie targeting
6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants
9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working
38fa220f Fix setting game rules via the API
fe3930ce Update to Minecraft 1.14.3-pre4
da071ec5 Remove outdated build delay.

Spigot Changes:
4d2f30f1 Update to Minecraft 1.14.3
f16400e3 Update to Minecraft 1.14.3-pre4
This commit is contained in:
Shane Freeder
2019-06-25 02:47:58 +01:00
parent 651932f299
commit 40748b3c8d
166 changed files with 783 additions and 820 deletions

View File

@@ -101,7 +101,7 @@ index 7cb46d7a9c..e96428bb2b 100644
return (int) (f + f1 + f2);
}
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index edd60a3d7f..93c3fa78f6 100644
index 2eabaaeba2..04f754d2c1 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -187,10 +187,20 @@ index edd60a3d7f..93c3fa78f6 100644
+ return this.d(this.x + i, this.y + j, this.z + k);
}
public void o(int i) {
- this.b = i;
+ this.x = i; // Paper change to x
}
public void p(int i) {
- this.c = i;
+ this.y = i; // Paper change to y
}
public void q(int i) {
- this.d = i;
+ this.z = i; // Paper change to z
}
@Override
--