From 361a5c71f1fddcf28b53d109558006c93ebdc459 Mon Sep 17 00:00:00 2001 From: Soulless-1 Date: Thu, 18 Sep 2025 00:14:58 -0400 Subject: [PATCH 1/3] Update CChar.cpp Now allowed to modify the statf_pet flag as needed per individual shard basis. --- src/game/chars/CChar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/chars/CChar.cpp b/src/game/chars/CChar.cpp index c712e956e..e9d4cbffd 100644 --- a/src/game/chars/CChar.cpp +++ b/src/game/chars/CChar.cpp @@ -3867,8 +3867,8 @@ bool CChar::r_LoadVal( CScript & s ) _uiStatFlag = s.GetArgLLVal() & ~ (uint64)STATF_SAVEPARITY; break; } - // Don't modify STATF_SAVEPARITY, STATF_PET, STATF_SPAWNED here - static constexpr auto uiFlagsNoChange = (STATF_SAVEPARITY | STATF_PET | STATF_SPAWNED); + // Don't modify STATF_SAVEPARITY, STATF_SPAWNED here. Allow STATF_PET though. + static constexpr auto uiFlagsNoChange = (STATF_SAVEPARITY | STATF_SPAWNED); static constexpr auto uiFlagsRequireFullUpdate = (STATF_STONE | STATF_HIDDEN | STATF_DEAD); const auto uiCurFlags = _uiStatFlag; const auto uiNewFlags = s.GetArgULLVal(); From 3dd537afb5a64c67cf11b32fc812a5884d95ec6c Mon Sep 17 00:00:00 2001 From: Soulless-1 Date: Fri, 19 Sep 2025 04:42:54 -0400 Subject: [PATCH 2/3] Only update follower count if EF_FollowerList is toggled on. --- src/game/chars/CCharSpell.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/chars/CCharSpell.cpp b/src/game/chars/CCharSpell.cpp index 62910f1f3..d5489be29 100644 --- a/src/game/chars/CCharSpell.cpp +++ b/src/game/chars/CCharSpell.cpp @@ -350,7 +350,10 @@ CChar * CChar::Spell_Summon_Place( CChar * pChar, CPointMap ptTarg, int64 iDurat } pChar->StatFlag_Set(STATF_CONJURED); // conjured creates have no loot pChar->NPC_LoadScript(false); - ASSERT(FollowersUpdate(pChar, pChar->GetFollowerSlots(), true)); + if (IsSetEF(EF_FollowerList)) + { + ASSERT(FollowersUpdate(pChar, pChar->GetFollowerSlots(), true)); + } pChar->NPC_PetSetOwner(this); pChar->MoveToChar(ptTarg); pChar->m_ptHome = ptTarg; From ca33df8bbfbf2cbd4e0796f6b6c130b538f32f55 Mon Sep 17 00:00:00 2001 From: Soulless-1 Date: Fri, 19 Sep 2025 07:13:24 -0400 Subject: [PATCH 3/3] Changed from EF_FollowerList to OF_PetSlots --- src/game/chars/CCharSpell.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/chars/CCharSpell.cpp b/src/game/chars/CCharSpell.cpp index d5489be29..7caf3ca8b 100644 --- a/src/game/chars/CCharSpell.cpp +++ b/src/game/chars/CCharSpell.cpp @@ -350,7 +350,7 @@ CChar * CChar::Spell_Summon_Place( CChar * pChar, CPointMap ptTarg, int64 iDurat } pChar->StatFlag_Set(STATF_CONJURED); // conjured creates have no loot pChar->NPC_LoadScript(false); - if (IsSetEF(EF_FollowerList)) + if (IsSetOF(OF_PetSlots)) { ASSERT(FollowersUpdate(pChar, pChar->GetFollowerSlots(), true)); }