Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-02 10:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail silently if correct NMS version is not found.

Browse Source 
This will fix errors when trying to set blocks when using the wrong
minecraft version. However, if users want support for schematics or
copy/pasting blocks with advanced data (eg things not yet supported by
Bukkit like mob spawner potentials or blocks from mods), they will
have to use the WorldEdit version corresponding to their Minecraft
version.
This commit is contained in:
Wizjany 2013-01-11 22:39:13 -05:00
parent c634ad6d08
commit 090052df5a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -886,10 +886,8 @@ public class BukkitWorld extends LocalWorld {
public boolean isValidBlockType(int type) {
if (!skipNmsValidBlockCheck) {
try {
return type == 0 || (type >= 1 && type < net.minecraft.server.Block.byId.length
&& net.minecraft.server.Block.byId[type] != null);
} catch (Exception e) {
logger.log(Level.SEVERE, "Error checking NMS valid block type", e);
return NmsBlock.isValidBlockType(type);
} catch (Throwable e) {
skipNmsValidBlockCheck = true;
}
}

5
src/main/java/com/sk89q/worldedit/bukkit/NmsBlock.java
View File

@ -434,4 +434,9 @@ class NmsBlock extends BaseBlock implements TileEntityBlock {
+ foreign.getClass().getCanonicalName());
}
}
public static boolean isValidBlockType(int type) throws NoClassDefFoundError {
return type == 0 || (type >= 1 && type < net.minecraft.server.Block.byId.length
&& net.minecraft.server.Block.byId[type] != null);
}
}