Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-02-25 15:51:37 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-88. Ladders, torches, levers, wall signs, stone buttons and rails that were facing north (i.e. hanging on a block to the south) now reset properly by making sure their south-face block is already reset.

Browse Source
This commit is contained in:
taoneill 2011-03-20 23:36:29 -04:00
parent 02cd9ad28d
commit b8fba72f2d
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
war/src/main/java/com/tommytony/war/volumes/Volume.java
View File

@ -172,6 +172,16 @@ public class Volume {
if(oldBlockType == Material.WALL_SIGN.getId()
|| oldBlockType == Material.SIGN_POST.getId()) {
// Signs
if(oldBlockType == Material.SIGN_POST.getId() && ((oldBlockData & 0x04) == 0x04)
&& i+1 != getSizeX()) {
Block southBlock = currentBlock.getFace(BlockFace.SOUTH);
int oldSouthBlockType = getBlockTypes()[i+1][j][k];
byte oldSouthBlockData = getBlockDatas()[i+1][j][k];
if(southBlock.getTypeId() != oldSouthBlockType) {
southBlock.setTypeId(oldSouthBlockType);
southBlock.setData(oldSouthBlockData);
}
}
currentBlock.setType(Material.getMaterial(oldBlockType));
BlockState state = currentBlock.getState();
state.setData(new org.bukkit.material.Sign(oldBlockType, oldBlockData));
@ -234,6 +244,25 @@ public class Volume {
blockAbove.setType(Material.getMaterial(oldBlockType));
blockAbove.setData(getBlockDatas()[i][j+1][k]);
}
} else if(((oldBlockType == Material.TORCH.getId() && ((oldBlockData & 0x02) == 0x02))
|| (oldBlockType == Material.REDSTONE_TORCH_OFF.getId() && ((oldBlockData & 0x02) == 0x02))
|| (oldBlockType == Material.REDSTONE_TORCH_ON.getId() && ((oldBlockData & 0x02) == 0x02))
|| (oldBlockType == Material.LEVER.getId() && ((oldBlockData & 0x02) == 0x02))
|| (oldBlockType == Material.STONE_BUTTON.getId() && ((oldBlockData & 0x02) == 0x02))
|| (oldBlockType == Material.LADDER.getId() && ((oldBlockData & 0x04) == 0x04))
|| (oldBlockType == Material.RAILS.getId() && ((oldBlockData & 0x02) == 0x02)))
&& i+1 != getSizeX()){
// Blocks that hang on a block south of themselves need to make sure that block is there before placing themselves... lol
Block southBlock = currentBlock.getFace(BlockFace.SOUTH);
int oldSouthBlockType = getBlockTypes()[i+1][j][k];
byte oldSouthBlockData = getBlockDatas()[i+1][j][k];
if(southBlock.getTypeId() != oldSouthBlockType) {
southBlock.setTypeId(oldSouthBlockType);
southBlock.setData(oldSouthBlockData);
}
// change the block itself, now that we have a block to set it on
currentBlock.setType(Material.getMaterial(oldBlockType));
currentBlock.setData(oldBlockData);
} else {
// regular block
currentBlock.setType(Material.getMaterial(oldBlockType));
@ -453,8 +482,8 @@ public class Volume {
if(hasTwoCorners() && getBlockTypes() != null) {
int x = getMinX();
for(int i = 0; i < getSizeX(); i++){
int y = getMinY();
for(int j = 0; j < getSizeY(); j++){
int y = getMaxY();
for(int j = getSizeY(); j > 0; j--){
int z = getMinZ();
for(int k = 0;k < getSizeZ(); k++) {
Block currentBlock = getWorld().getBlockAt(x, y, z);
@ -470,7 +499,7 @@ public class Volume {
}
z++;
}
y++;
y--;
}
x++;
}