From 7e998542465047ad796aab9adeda96525e15036b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 27 Jul 2013 11:56:56 +1000 Subject: [PATCH] 1,3 can only be expressed as an integer, not a byte! #logic --- CraftBukkit-Patches/0018-Orebfuscator.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CraftBukkit-Patches/0018-Orebfuscator.patch b/CraftBukkit-Patches/0018-Orebfuscator.patch index d474eab4cd..0e05365ff0 100644 --- a/CraftBukkit-Patches/0018-Orebfuscator.patch +++ b/CraftBukkit-Patches/0018-Orebfuscator.patch @@ -1,4 +1,4 @@ -From 14f85a79d6d556e58e85c59d5f2d9cf722ee5577 Mon Sep 17 00:00:00 2001 +From f69a63cfb3198d6a100a017ae2f5225251382eab Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 16 May 2013 18:51:05 +1000 Subject: [PATCH] Orebfuscator @@ -108,7 +108,7 @@ index a7afa55..1a60229 100644 diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java new file mode 100644 -index 0000000..bcd946d +index 0000000..22fbcca --- /dev/null +++ b/src/main/java/org/spigotmc/AntiXray.java @@ -0,0 +1,183 @@ @@ -228,7 +228,7 @@ index 0000000..bcd946d + { + randomOre = 0; + } -+ buffer[index] = world.spigotConfig.xRayReplacements[randomOre++]; ++ buffer[index] = (byte) world.spigotConfig.xRayReplacements[randomOre++]; + break; + } + } @@ -296,13 +296,13 @@ index 0000000..bcd946d + } +} diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 3e66d79..aea428c 100644 +index 3e66d79..64f3c7f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -1,5 +1,7 @@ package org.spigotmc; -+import gnu.trove.set.hash.TByteHashSet; ++import gnu.trove.set.hash.TIntHashSet; +import java.util.Arrays; import java.util.List; import org.bukkit.Bukkit; @@ -318,7 +318,7 @@ index 3e66d79..aea428c 100644 + { + 14, 15, 16, 21, 48, 49, 54, 56, 73, 74, 82, 129, 130 + } ); -+ public byte[] xRayReplacements; ++ public int[] xRayReplacements; + public AntiXray antiXrayInstance; + private void antiXray() + { @@ -335,7 +335,7 @@ index 3e66d79..aea428c 100644 + blocks = getList( "anti-xray.blocks", blocks ); + log( "\tBlocks: " + blocks ); + -+ xRayReplacements = new TByteHashSet( getList( "anti-xray.replacements", Arrays.asList( new Byte[] ++ xRayReplacements = new TIntHashSet( getList( "anti-xray.replacements", Arrays.asList( new Integer[] + { + 1, 3 + } ) ) ).toArray();