diff --git a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java index a440657dd..093ed7c76 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java @@ -60,7 +60,7 @@ public class BlockBeehives extends BlockContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { // Handle TE'd beehives TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index 225833ab2..66b336f05 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -67,7 +67,7 @@ public class BlockArbStairs extends BlockStairs { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (Proxies.common.isSimulating(world) && canHarvestBlock(player, meta)) { if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java index 17808c57c..80658e30d 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java @@ -65,7 +65,7 @@ public class BlockFruitPod extends BlockCocoa { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (Proxies.common.isSimulating(world)) { TileFruitPod tile = getPodTile(world, x, y, z); if (tile != null) { @@ -75,7 +75,7 @@ public class BlockFruitPod extends BlockCocoa { } } - return super.removedByPlayer(world, player, x, y, z, willHarvest); + return super.removedByPlayer(world, player, x, y, z); } @Override diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java index 336358350..a273bfe62 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java @@ -164,7 +164,7 @@ public class BlockSapling extends BlockTreeContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (Proxies.common.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { if (!player.capabilities.isCreativeMode) { dropAsSapling(world, x, y, z); diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java index d19517f60..c16b5ee61 100755 --- a/src/main/java/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/gadgets/BlockBase.java @@ -209,7 +209,7 @@ public class BlockBase extends BlockForestry { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { IOwnable tile = (IOwnable) world.getTileEntity(x, y, z); if (tile == null) { diff --git a/src/main/java/forestry/core/gadgets/BlockForestry.java b/src/main/java/forestry/core/gadgets/BlockForestry.java index 8d05c852f..661a8a80b 100755 --- a/src/main/java/forestry/core/gadgets/BlockForestry.java +++ b/src/main/java/forestry/core/gadgets/BlockForestry.java @@ -35,10 +35,10 @@ public abstract class BlockForestry extends BlockContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { IOwnable tile = (IOwnable) world.getTileEntity(x, y, z); if (!tile.isOwnable() || tile.allowsRemoval(player)) { - return super.removedByPlayer(world, player, x, y, z, willHarvest); + return super.removedByPlayer(world, player, x, y, z); } else { return false; } diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 55c05a9da..a6035c1a8 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -263,12 +263,12 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit @Override public final boolean allowsRemoval(EntityPlayer player) { - return Config.disablePermissions || !isOwnable() || !isOwned() || isOwner(player) || Proxies.common.isOp(player); + return Config.disablePermissions || getAccess() == EnumAccess.SHARED || !isOwnable() || !isOwned() || isOwner(player) || Proxies.common.isOp(player); } @Override public final boolean allowsAlteration(EntityPlayer player) { - return allowsRemoval(player) || getAccess() == EnumAccess.SHARED; + return allowsRemoval(player); } @Override diff --git a/src/main/java/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ClientProxyCommon.java index ff417a02d..9fa3ff361 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ClientProxyCommon.java @@ -87,7 +87,7 @@ public class ClientProxyCommon extends ProxyCommon { @Override public boolean isOp(EntityPlayer player) { - return true; + return false; } @Override diff --git a/src/main/java/forestry/farming/gadgets/BlockFarm.java b/src/main/java/forestry/farming/gadgets/BlockFarm.java index c88525177..e3a8c7068 100755 --- a/src/main/java/forestry/farming/gadgets/BlockFarm.java +++ b/src/main/java/forestry/farming/gadgets/BlockFarm.java @@ -89,7 +89,7 @@ public class BlockFarm extends BlockStructure { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (Proxies.common.isSimulating(world) && canHarvestBlock(player, meta)) { List drops = getDrops(world, x, y, z, 0, 0);