Pet: Simplify bool logic of previous commit and fix logical errors wh…

…en in combo with CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT Closes #483
cmangos · Jan 8, 2024 · 5995e66 · 5995e66
1 parent 4a17f69
commit 5995e66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -1924,9 +1924,10 @@ bool Player::Mount(uint32 displayid, const Aura* aura/* = nullptr*/)
     if (!Unit::Mount(displayid, aura))
         return false;
 
+    bool keepPetOnMount = !sWorld.getConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT);
+    bool keepPetOnFlyingMount = !keepPetOnMount ? false : sWorld.getConfig(CONFIG_BOOL_KEEP_PET_ON_FLYING_MOUNT);
     // Custom mount (non-aura such as taxi or command) or in flight: unsummon any pet
-    if (!sWorld.getConfig(CONFIG_BOOL_KEEP_PET_WHEN_MOUNTED) &&
-        (!aura || IsFreeFlying() || IsSpellHaveAura(aura->GetSpellProto(), SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)))
+    if (!aura || (!keepPetOnFlyingMount && (IsFreeFlying() || IsSpellHaveAura(aura->GetSpellProto(), SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED))))
     {
         UnsummonPetTemporaryIfAny();
     }
@@ -1935,8 +1936,7 @@ bool Player::Mount(uint32 displayid, const Aura* aura/* = nullptr*/)
     {
         if (Pet* pet = GetPet())
         {
-            if (pet->isControlled() && !sWorld.getConfig(CONFIG_BOOL_KEEP_PET_WHEN_MOUNTED) &&(!(pet->isTemporarySummoned() || InArena())
-                                        || sWorld.getConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT)))
+            if (pet->isControlled() && (!(pet->isTemporarySummoned() || InArena() || keepPetOnMount)))
                 UnsummonPetTemporaryIfAny();
             else
                 pet->SetModeFlags(PET_MODE_DISABLE_ACTIONS);

diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp
@@ -793,7 +793,7 @@ void World::LoadConfigSettings(bool reload)
     setConfig(CONFIG_UINT32_INTERACTION_PAUSE_TIMER, "InteractionPauseTimer", 180000);
 
     setConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT,      "PetUnsummonAtMount", false);
-    setConfig(CONFIG_BOOL_KEEP_PET_WHEN_MOUNTED,  "KeepPetWhenMounted", false);
+    setConfig(CONFIG_BOOL_KEEP_PET_ON_FLYING_MOUNT,   "KeepPetOnFlyingMount", false);
     setConfig(CONFIG_BOOL_PET_ATTACK_FROM_BEHIND,     "PetAttackFromBehind", true);
 
     setConfig(CONFIG_BOOL_AUTO_DOWNRANK,              "AutoDownrank", true);

diff --git a/src/game/World/World.h b/src/game/World/World.h
@@ -392,7 +392,7 @@ enum eConfigBoolValues
     CONFIG_BOOL_CLEAN_CHARACTER_DB,
     CONFIG_BOOL_VMAP_INDOOR_CHECK,
     CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT,
-    CONFIG_BOOL_KEEP_PET_WHEN_MOUNTED,
+    CONFIG_BOOL_KEEP_PET_ON_FLYING_MOUNT,
     CONFIG_BOOL_PET_ATTACK_FROM_BEHIND,
     CONFIG_BOOL_AUTO_DOWNRANK,
     CONFIG_BOOL_MMAP_ENABLED,

diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
@@ -818,7 +818,7 @@ LogColors = ""
 #        Default: 0 - unsummon only when appropriate (don't unsummon temp summons on ground mounting)
 #                 1 - always unsummon controlled pets on mounting
 #
-#    KeepPetWhenMounted
+#    KeepPetOnFlyingMount
 #        Permanent pet will only be unsummoned when flying
 #        Default: 0 - unsummon depending on PetUnsummonAtMount
 #                 1 - permanent pet will remain summoned unless flying
@@ -942,7 +942,7 @@ SkillChance.Prospecting = 0
 SkillChance.Milling = 0
 OffhandCheckAtTalentsReset = 0
 PetUnsummonAtMount = 0
-KeepPetWhenMounted = 0
+KeepPetOnFlyingMount = 0
 ClientCacheVersion = 0
 PetAttackFromBehind = 1
 AutoDownrank = 1