Merge pull request #48 from MarioG1/master

Fix for 1.8.3
master
Lishid 2015-04-15 14:01:06 -04:00
commit c08efb6ba1
4 changed files with 10 additions and 7 deletions

View File

@ -4,7 +4,7 @@
<groupId>com.lishid</groupId>
<artifactId>orebfuscator</artifactId>
<packaging>jar</packaging>
<version>3.0.0</version>
<version>3.0.6</version>
<name>Orebfuscator</name>
<url>http://dev.bukkit.org/server-mods/orebfuscator/</url>
@ -34,7 +34,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.8-R0.1-SNAPSHOT</version>
<version>1.8.3-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -121,6 +121,9 @@ public class OrebfuscatorConfig {
if (i == org.bukkit.Material.TNT.getId()) {
TransparentBlocks[i] = false;
}
if (i == org.bukkit.Material.AIR.getId()) {
TransparentBlocks[i] = true;
}
}
TransparentCached = true;
}
@ -181,10 +184,10 @@ public class OrebfuscatorConfig {
return retval.length() > 1 ? retval.substring(0, retval.length() - 2) : retval;
}
public static byte getRandomBlock(int index, boolean alternate, World.Environment environment) {
public static int getRandomBlock(int index, boolean alternate, World.Environment environment) {
if (environment == World.Environment.NETHER)
return (byte) (int) (NetherRandomBlocks[index]);
return (byte) (int) (alternate ? RandomBlocks2[index] : RandomBlocks[index]);
return (int) (NetherRandomBlocks[index]);
return (int) (alternate ? RandomBlocks2[index] : RandomBlocks[index]);
}
public static Integer[] getRandomBlocks(boolean alternate, World.Environment environment) {

View File

@ -27,7 +27,7 @@ import org.bukkit.entity.Player;
public class MinecraftInternals {
public static boolean isBlockTransparent(int id) {
return !Block.getById(id).s();
return Block.getById(id).s();
}
public static void updateBlockTileEntity(org.bukkit.block.Block block, Player player) {

View File

@ -1,6 +1,6 @@
name: Orebfuscator3
main: com.lishid.orebfuscator.Orebfuscator
version: 3.0.5
version: 3.0.6
author: lishid
softdepend: [ProtocolLib]
load: startup