From 63ce45752ab94b47e85201d0622c711a12069fb6 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 28 Aug 2016 18:25:55 +1000 Subject: $ Fixed a Bug regarding mis-registration of blocks. $ Fixed a bug where rendering code was called server-side, causing a crash. --- src/Java/miscutil/core/block/base/BlockBaseModular.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Java/miscutil/core/block/base') diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java index 5e0bc163c2..1b07339246 100644 --- a/src/Java/miscutil/core/block/base/BlockBaseModular.java +++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java @@ -27,10 +27,10 @@ public class BlockBaseModular extends BasicBlock{ this.thisBlockMaterial = blockMaterial; this.setBlockName(getLocalizedName()); - if (thisBlock == BlockTypes.STANDARD){ + if (thisBlock.name().toLowerCase() == BlockTypes.STANDARD.name().toLowerCase()){ LanguageRegistry.addName(this, "Block of "+blockMaterial); } - else if (thisBlock == BlockTypes.FRAME){ + else if (thisBlock.name().toLowerCase() == BlockTypes.FRAME.name().toLowerCase()){ LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); } else { @@ -38,10 +38,10 @@ public class BlockBaseModular extends BasicBlock{ } //setOreDict(unlocalizedName, blockType); - if (thisBlock == BlockTypes.STANDARD){ + if (thisBlock.name().toLowerCase() == BlockTypes.STANDARD.name().toLowerCase()){ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName); } - else if (thisBlock == BlockTypes.FRAME){ + else if (thisBlock.name().toLowerCase() == BlockTypes.FRAME.name().toLowerCase()){ GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, blockType.getTexture()+unlocalizedName); } -- cgit