[+] Config option to toggle weather pets can match their owners visib…

…ility status
brainsynder-Dev · Jun 26, 2023 · a9fe1fc · a9fe1fc
1 parent c2f14d3
commit a9fe1fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/API/src/main/java/simplepets/brainsynder/api/plugin/config/ConfigOption.java b/API/src/main/java/simplepets/brainsynder/api/plugin/config/ConfigOption.java
@@ -314,6 +314,11 @@ This option allows for the removal of the placeholder items (The glass panes)
                     Should pet owners be able to open their pets data menu when right clicking the pet.
                     
                     Default: {default}""");
+    public final ConfigEntry<Boolean> MISC_TOGGLES_PET_VANISHING = createOption("misc-toggles.enable-pet-vanishing", true,
+            """
+                    Should pets turn invisible when their owner is not visible (either via Spectator or Invisibility potions)
+
+                    Default: {default}""");
 
 
     // Pet Toggles

diff --git a/NMS_Master/src/main/java/simplepets/brainsynder/nms/entity/EntityPet.java b/NMS_Master/src/main/java/simplepets/brainsynder/nms/entity/EntityPet.java
@@ -491,7 +491,9 @@ public void tick() {
             if (displayName && hideNameShifting)
                 getEntity().setCustomNameVisible((!shifting));
 
-            if (!canIgnoreVanish()) {
+            // Checks if the pet can actually be toggled to match their owners
+            // player visibility status
+            if ((!canIgnoreVanish()) && ConfigOption.INSTANCE.MISC_TOGGLES_PET_VANISHING.getValue()) {
                 boolean ownerVanish = (VersionTranslator.getEntityHandle(player).isInvisible()
                         // Added this check for SuperVanish and PremiumVanish since they recommend using this method to check
                         || SimplePets.getPetUtilities().isVanished(player)