tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix a small advanced solar placement bug.

Browse source
This commit is contained in:
Ben Spiers 2014-07-28 23:11:08 +01:00
parent 9413950842
commit 6f4e0da3c5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/generators/common/block/BlockGenerator.java
View file

@ -239,16 +239,18 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
@Override
public boolean canPlaceBlockAt(World world, int x, int y, int z)
{
//This method doesn't actually seem to be used in MC code...
if(world.getBlockMetadata(x, y, z) == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta)
{
boolean canPlace = super.canPlaceBlockAt(world, x, y, z);
boolean nonAir = false;
nonAir |= world.isAirBlock(x, y, z);
nonAir |= world.isAirBlock(x, y+1, x);
for(int xPos=-1;xPos<=2;xPos++)
for(int xPos=-1;xPos<=1;xPos++)
{
for(int zPos=-1;zPos<=2;zPos++)
for(int zPos=-1;zPos<=1;zPos++)
{
nonAir |= world.isAirBlock(x+xPos, y+2, z+zPos);
}

2
src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
View file

@ -127,7 +127,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
if(stack.getItemDamage() == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta)
{
if(!block.isReplaceable(world, x, y, z))
if(!(block.isReplaceable(world, x, y, z) && world.isAirBlock(x, y+1, z)))
{
return false;
}