aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/core/block/base
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-08-28 18:25:55 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-08-28 18:25:55 +1000
commit63ce45752ab94b47e85201d0622c711a12069fb6 (patch)
treee99db59fb8dd993012a1ba52f85b3986efceab0d /src/Java/miscutil/core/block/base
parent3f0a804015250f3ae1ce417e11462531a3dadcf2 (diff)
downloadGT5-Unofficial-63ce45752ab94b47e85201d0622c711a12069fb6.tar.gz
GT5-Unofficial-63ce45752ab94b47e85201d0622c711a12069fb6.tar.bz2
GT5-Unofficial-63ce45752ab94b47e85201d0622c711a12069fb6.zip
$ Fixed a Bug regarding mis-registration of blocks.
$ Fixed a bug where rendering code was called server-side, causing a crash.
Diffstat (limited to 'src/Java/miscutil/core/block/base')
-rw-r--r--src/Java/miscutil/core/block/base/BlockBaseModular.java8
1 files changed, 4 insertions, 4 deletions
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);
}