Revert "Fix the isLoaded check for AntiXray" Seems to causes issues still

This reverts commit fc52435f5b.
This commit is contained in:
Thinkofdeath 2014-02-05 19:55:31 +00:00
parent fc52435f5b
commit 9746d9bfc6

View file

@ -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 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000 Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator Subject: [PATCH] Orebfuscator
@ -128,10 +128,10 @@ index 5b0875d..1aca7f6 100644
public void b(int i, int j, int k, Block block, int l) { 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 diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
new file mode 100644 new file mode 100644
index 0000000..fb92384 index 0000000..297fae8
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/AntiXray.java +++ b/src/main/java/org/spigotmc/AntiXray.java
@@ -0,0 +1,199 @@ @@ -0,0 +1,200 @@
+package org.spigotmc; +package org.spigotmc;
+ +
+import gnu.trove.set.TByteSet; +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) + private static boolean isLoaded(World world, int x, int y, int z, int radius)
+ { + {
+ return world.isLoaded( x, y, z ) + return world.isLoaded( x, y, z )
+ && ( radius == 0 || ( isLoaded( world, x + 1, y, z, 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 - 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 - 1, z, radius - 1 )
+ && isLoaded( world, x, y, z - 1, 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) + 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