From 3203adae7cfea2f0abacbe4fb4a61f57ef54a01b Mon Sep 17 00:00:00 2001 From: Detrav Date: Mon, 21 Mar 2016 02:28:02 +0300 Subject: Fix for creative --- .../behaviours/BehaviourDetravToolElectricProPick.java | 3 ++- .../items/behaviours/BehaviourDetravToolProPick.java | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/main/java/com/detrav') diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 9fa0f06fe5..dfb944e385 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -73,7 +73,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, ""); DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); - tool.doDamage(aStack, this.mCosts * chunks.size()); + if (!aPlayer.capabilities.isCreativeMode) + tool.doDamage(aStack, this.mCosts * chunks.size()); } return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 2669c1a541..405d760f44 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -60,7 +60,8 @@ public class BehaviourDetravToolProPick extends Behaviour_None { GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) aTileEntity; String name = GT_LanguageManager.getTranslation("gt.blockores." + gt_entity.getMetaData() + ".name"); aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name)); - aItem.doDamage(aStack, this.mCosts); + if (!aPlayer.capabilities.isCreativeMode) + aItem.doDamage(aStack, this.mCosts); return; } } @@ -88,21 +89,21 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } } } - for(String key : ores.keySet()) - { + for (String key : ores.keySet()) { int value = ores.get(key); - if(value<10) + if (value < 10) aPlayer.addChatMessage(new ChatComponentText(foundTexts[1] + key)); - else if(value<30) + else if (value < 30) aPlayer.addChatMessage(new ChatComponentText(foundTexts[2] + key)); - else if(value<60) + else if (value < 60) aPlayer.addChatMessage(new ChatComponentText(foundTexts[3] + key)); - else if(value<100) + else if (value < 100) aPlayer.addChatMessage(new ChatComponentText(foundTexts[4] + key)); else aPlayer.addChatMessage(new ChatComponentText(foundTexts[5] + key)); } - aItem.doDamage(aStack, this.mCosts); + if (!aPlayer.capabilities.isCreativeMode) + aItem.doDamage(aStack, this.mCosts); return; } aPlayer.addChatMessage(new ChatComponentText(foundTexts[0])); -- cgit