summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-18 19:23:33 +1000
committermd_5 <git@md-5.net>2017-06-18 19:23:33 +1000
commit03f1e37ae2f81b4a34006266e4a01f98aeaf5aff (patch)
tree84e22ee9704048e87a6c20513a6aba0eea5bfe01 /nms-patches
parent4e27449ac253ad282bdbf885b05c96a9c7241633 (diff)
downloadcraftbukkit-03f1e37ae2f81b4a34006266e4a01f98aeaf5aff.tar
craftbukkit-03f1e37ae2f81b4a34006266e4a01f98aeaf5aff.tar.gz
craftbukkit-03f1e37ae2f81b4a34006266e4a01f98aeaf5aff.tar.lz
craftbukkit-03f1e37ae2f81b4a34006266e4a01f98aeaf5aff.tar.xz
craftbukkit-03f1e37ae2f81b4a34006266e4a01f98aeaf5aff.zip
Fix nether world border center not adjusting
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/PacketPlayOutWorldBorder.patch15
-rw-r--r--nms-patches/WorldProviderHell.patch16
2 files changed, 31 insertions, 0 deletions
diff --git a/nms-patches/PacketPlayOutWorldBorder.patch b/nms-patches/PacketPlayOutWorldBorder.patch
new file mode 100644
index 00000000..d37e4ec3
--- /dev/null
+++ b/nms-patches/PacketPlayOutWorldBorder.patch
@@ -0,0 +1,15 @@
+--- a/net/minecraft/server/PacketPlayOutWorldBorder.java
++++ b/net/minecraft/server/PacketPlayOutWorldBorder.java
+@@ -18,8 +18,10 @@
+
+ public PacketPlayOutWorldBorder(WorldBorder worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction packetplayoutworldborder_enumworldborderaction) {
+ this.a = packetplayoutworldborder_enumworldborderaction;
+- this.c = worldborder.getCenterX();
+- this.d = worldborder.getCenterZ();
++ // CraftBukkit start - multiply out nether border
++ this.c = worldborder.getCenterX() * (worldborder.world.worldProvider instanceof WorldProviderHell ? 8 : 1);
++ this.d = worldborder.getCenterZ() * (worldborder.world.worldProvider instanceof WorldProviderHell ? 8 : 1);
++ // CraftBukkit end
+ this.f = worldborder.getSize();
+ this.e = worldborder.j();
+ this.g = worldborder.i();
diff --git a/nms-patches/WorldProviderHell.patch b/nms-patches/WorldProviderHell.patch
new file mode 100644
index 00000000..3b43b316
--- /dev/null
+++ b/nms-patches/WorldProviderHell.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/server/WorldProviderHell.java
++++ b/net/minecraft/server/WorldProviderHell.java
+@@ -44,11 +44,11 @@
+ public WorldBorder getWorldBorder() {
+ return new WorldBorder() {
+ public double getCenterX() {
+- return super.getCenterX() / 8.0D;
++ return super.getCenterX(); // CraftBukkit
+ }
+
+ public double getCenterZ() {
+- return super.getCenterZ() / 8.0D;
++ return super.getCenterZ(); // CraftBukkit
+ }
+ };
+ }