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

A few creative enhancements

Browse source
This commit is contained in:
Aidan C. Brady 2014-03-09 21:55:01 -04:00
parent 1b051c0dec
commit 653aa6c30f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/CommonPlayerTickHandler.java
View file

@ -156,7 +156,7 @@ public class CommonPlayerTickHandler implements ITickHandler
{ {
ItemStack stack = player.inventory.armorInventory[2]; ItemStack stack = player.inventory.armorInventory[2];
if(stack != null) if(stack != null && !player.capabilities.isCreativeMode)
{ {
if(stack.getItem() instanceof ItemJetpack) if(stack.getItem() instanceof ItemJetpack)
{ {

7
common/mekanism/common/item/ItemAtomicDisassembler.java
View file

@ -201,7 +201,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
private boolean useHoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) private boolean useHoe(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side)
{ {
if(!player.canPlayerEdit(x, y, z, side, stack) || getEnergy(stack) < HOE_USAGE) if(!player.canPlayerEdit(x, y, z, side, stack) || (!player.capabilities.isCreativeMode && getEnergy(stack) < HOE_USAGE))
{ {
return false; return false;
} }
@ -233,7 +233,12 @@ public class ItemAtomicDisassembler extends ItemEnergized
} }
else { else {
world.setBlock(x, y, z, block.blockID); world.setBlock(x, y, z, block.blockID);
if(!player.capabilities.isCreativeMode)
{
setEnergy(stack, getEnergy(stack)-HOE_USAGE); setEnergy(stack, getEnergy(stack)-HOE_USAGE);
}
return true; return true;
} }
} }