From 9746d9bfc63079d36c109f36ccacb4817482fea3 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 5 Feb 2014 19:55:31 +0000 Subject: [PATCH] Revert "Fix the isLoaded check for AntiXray" Seems to causes issues still This reverts commit fc52435f5b5559ffba8d2f62a4465a7069c084e6. --- CraftBukkit-Patches/0068-Orebfuscator.patch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/CraftBukkit-Patches/0068-Orebfuscator.patch b/CraftBukkit-Patches/0068-Orebfuscator.patch index 1d05f6200a..8f9ceb7025 100644 --- a/CraftBukkit-Patches/0068-Orebfuscator.patch +++ b/CraftBukkit-Patches/0068-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 066a414832ffc94fba71abb4a59ef83c7fa38ede Mon Sep 17 00:00:00 2001 +From af77f1fa0985f52d888dfd1d6302aa41d0dc786d Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -128,10 +128,10 @@ index 5b0875d..1aca7f6 100644 public void b(int i, int j, int k, Block block, int l) { diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java new file mode 100644 -index 0000000..fb92384 +index 0000000..297fae8 --- /dev/null +++ b/src/main/java/org/spigotmc/AntiXray.java -@@ -0,0 +1,199 @@ +@@ -0,0 +1,200 @@ +package org.spigotmc; + +import gnu.trove.set.TByteSet; @@ -311,12 +311,13 @@ index 0000000..fb92384 + private static boolean isLoaded(World world, int x, int y, int z, int radius) + { + return world.isLoaded( x, y, z ) -+ && ( radius == 0 || ( isLoaded( world, x + 1, y, z, radius - 1 ) -+ && isLoaded( world, x - 1, y, z, radius - 1 ) -+ && isLoaded( world, x, y + 1, z, radius - 1 ) -+ && isLoaded( world, x, y - 1, z, radius - 1 ) -+ && isLoaded( world, x, y, z + 1, radius - 1 ) -+ && isLoaded( world, x, y, z - 1, radius - 1 ) ) ); ++ || ( radius > 0 ++ && ( isLoaded( world, x + 1, y, z, radius - 1 ) ++ || isLoaded( world, x - 1, y, z, radius - 1 ) ++ || isLoaded( world, x, y + 1, z, radius - 1 ) ++ || isLoaded( world, x, y - 1, z, radius - 1 ) ++ || isLoaded( world, x, y, z + 1, radius - 1 ) ++ || isLoaded( world, x, y, z - 1, radius - 1 ) ) ); + } + + private static boolean hasTransparentBlockAdjacent(World world, int x, int y, int z, int radius) @@ -380,5 +381,5 @@ index d4e8bf4..b9399ad 100644 + } } -- -1.8.4.msysgit.0 +1.8.3.2