Updated BlockRotator

Updated BlockRotator to check if a block is an instance of DoorBlock
instead of checking for BaseDimDoor - since we changed BaseDimDoor to
derive from DoorBlock, the latter check is no longer needed.
This commit is contained in:
SenseiKiwi
2013-09-07 22:16:47 -04:00
parent fb59a3dacb
commit 7280b54c47
2 changed files with 3 additions and 5 deletions

View File

@@ -32,10 +32,8 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
{ {
protected final DDProperties properties; protected final DDProperties properties;
private Icon blockIconBottom; private Icon blockIconBottom;
protected boolean isBlockContainer=true; protected boolean isBlockContainer = true;
private boolean isTileProvider = true; private boolean isTileProvider = true;
public BaseDimDoor(int blockID, Material material, DDProperties properties) public BaseDimDoor(int blockID, Material material, DDProperties properties)
{ {
@@ -185,6 +183,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
tile.openOrClosed = this.isDoorOpen( par1World, par2, par3, par4); tile.openOrClosed = this.isDoorOpen( par1World, par2, par3, par4);
tile.orientation = this.getFullMetadata(par1World, par2, par3, par4) & 7; tile.orientation = this.getFullMetadata(par1World, par2, par3, par4) & 7;
} }
private void setDoorRotation(int par1) private void setDoorRotation(int par1)
{ {
float var2 = 0.1875F; float var2 = 0.1875F;

View File

@@ -7,7 +7,6 @@ import net.minecraft.block.BlockRedstoneRepeater;
import net.minecraft.block.BlockStairs; import net.minecraft.block.BlockStairs;
import StevenDimDoors.mod_pocketDim.Point3D; import StevenDimDoors.mod_pocketDim.Point3D;
import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.blocks.BaseDimDoor;
public class BlockRotator public class BlockRotator
{ {
@@ -379,7 +378,7 @@ public class BlockRotator
break; break;
} }
} }
else if(Block.blocksList[blockID] instanceof BlockRedstoneRepeater || Block.blocksList[blockID] instanceof BlockDoor || Block.blocksList[blockID] instanceof BaseDimDoor || blockID== Block.tripWireSource.blockID || Block.blocksList[blockID] instanceof BlockComparator) else if (Block.blocksList[blockID] instanceof BlockRedstoneRepeater || Block.blocksList[blockID] instanceof BlockDoor || blockID== Block.tripWireSource.blockID || Block.blocksList[blockID] instanceof BlockComparator)
{ {
switch (metadata) switch (metadata)
{ {