diff options
Diffstat (limited to 'main/java/gregtech/common')
| -rw-r--r-- | main/java/gregtech/common/blocks/GT_Block_Machines.java | 8 | ||||
| -rw-r--r-- | main/java/gregtech/common/tools/GT_Tool_Wrench.java | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/main/java/gregtech/common/blocks/GT_Block_Machines.java b/main/java/gregtech/common/blocks/GT_Block_Machines.java index 07dfa1dbfe..dd791ec783 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -296,10 +296,14 @@ public class GT_Block_Machines public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ)
{
+// System.out.println("player hardness");
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
- if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, false))) {
- return -1.0F;
+ if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, true))) {
+// System.out.println("locked");
+ return -1.0F;
}
+// System.out.println("unlocked");
+// System.out.println("hardness: "+super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ));
return super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ);
}
diff --git a/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/main/java/gregtech/common/tools/GT_Tool_Wrench.java index 8a79c96750..2b68b6eaa2 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Wrench.java +++ b/main/java/gregtech/common/tools/GT_Tool_Wrench.java @@ -141,10 +141,4 @@ public class GT_Tool_Wrench {
return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " threw a Monkey Wrench into the Plans of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);
}
-}
-
-
-/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
- * Qualified Name: gregtech.common.tools.GT_Tool_Wrench
- * JD-Core Version: 0.7.0.1
- */
\ No newline at end of file +}
\ No newline at end of file |