mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-20 20:32:24 +00:00
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
This commit is contained in:
commit
ac59109af3
19 files changed
+38
-1
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package com.cricketcraft.chisel.block;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EnumCreatureType;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.api.ICarvable;
|
||||
@@ -26,4 +28,8 @@ public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarva
|
||||
return false;
|
||||
}
|
||||
*/
|
||||
@Override
|
||||
public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,12 @@ public class BlockCarvablePillar extends BlockCarvable {
|
||||
}
|
||||
|
||||
public IIcon getCtmIcon(int index, int metadata) {
|
||||
CarvableVariation var = carverHelper.variations.get(metadata);
|
||||
//Workaround to prevent crash with invalid meta
|
||||
CarvableVariation var = null;
|
||||
if(metadata <= carverHelper.variations.size())
|
||||
var = carverHelper.variations.get(metadata);
|
||||
else
|
||||
var = carverHelper.variations.get(0);
|
||||
|
||||
if (index >= 4)
|
||||
return var.iconTop;
|
||||
|
||||
Reference in new issue
Block a user