Merge pull request #231 from DoKM/master

DoKM Fork Merge

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCooldowns.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCooldowns.java
index 053910bc..7a37c0ce 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCooldowns.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/ItemCooldowns.java
@@ -65,6 +65,10 @@ public class ItemCooldowns {
     }
 
     public static long getTreecapCooldownWithPet(){
+        if (!NotEnoughUpdates.INSTANCE.config.itemOverlays.enableCooldownInItemDurability){
+            return 0;
+        }
+
         PetInfoOverlay.Pet pet = PetInfoOverlay.getCurrentPet();
         if (NotEnoughUpdates.INSTANCE.config.itemOverlays.enableMonkeyCheck && pet != null) {
             if (pet.petLevel != null &&
@@ -119,6 +123,10 @@ public class ItemCooldowns {
             if(lastChar >= '0' && lastChar <= '9') {
                 return true;
             }
+        } else if(internalname.equals("DIVAN_DRILL")){
+            return true;
+        } else if(internalname.equals("GEMSTONE_GAUNTLET")){
+            return true;
         }
         return false;
     }