From f48410a39c98aa5a25f243877e2aa47357d46afc Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 10 Dec 2014 19:16:37 +0000 Subject: Fix per a world world borders Well... mostly anyway --- nms-patches/WorldBorder.patch | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'nms-patches/WorldBorder.patch') diff --git a/nms-patches/WorldBorder.patch b/nms-patches/WorldBorder.patch index 841f4cba..daf3517f 100644 --- a/nms-patches/WorldBorder.patch +++ b/nms-patches/WorldBorder.patch @@ -1,6 +1,14 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/WorldBorder.java 2014-11-28 17:43:43.417707428 +0000 -+++ src/main/java/net/minecraft/server/WorldBorder.java 2014-11-28 17:38:22.000000000 +0000 -@@ -32,9 +32,21 @@ +--- ../work/decompile-8eb82bde/net/minecraft/server/WorldBorder.java 2014-12-10 19:16:20.872465385 +0000 ++++ src/main/java/net/minecraft/server/WorldBorder.java 2014-12-10 19:11:46.664468361 +0000 +@@ -18,6 +18,7 @@ + private double j; + private int k; + private int l; ++ public WorldServer world; // CraftBukkit + + public WorldBorder() { + this.e = this.d; +@@ -32,9 +33,21 @@ return (double) (blockposition.getX() + 1) > this.b() && (double) blockposition.getX() < this.d() && (double) (blockposition.getZ() + 1) > this.c() && (double) blockposition.getZ() < this.e(); } @@ -23,3 +31,11 @@ public boolean a(AxisAlignedBB axisalignedbb) { return axisalignedbb.d > this.b() && axisalignedbb.a < this.d() && axisalignedbb.f > this.c() && axisalignedbb.c < this.e(); +@@ -177,6 +190,7 @@ + } + + public void a(IWorldBorderListener iworldborderlistener) { ++ if (a.contains(iworldborderlistener)) return; // CraftBukkit + this.a.add(iworldborderlistener); + } + -- cgit v1.2.3