Merge branch 'dev' into change-serv-map-arguments

Author: mtwango

Changelog.txt

@@ -4149,6 +4149,10 @@ When setting a property like MORE to the a spell or skill defname, trying to rea
   WARNING! POTENTIALLY BREAKING CHANGE!
 - Changed: Chance to hit in `CombatDamageEra=0` (Sphere custom) now returns calculated value, instead of random number from that value.
 
+03-10-2026, yeiffet
+- Fixed: "vector too long" exception in CWorldTicker, which made some characters stop ticking, so they couldn't die (#1593).
+
 08-10-2026, Mulambo
+- Changed: Equipped armor / weapon will also drop on ground when moving it while overweight, like other items (unless OF_OWNoDropCarriedItem is enabled).
   WARNING! POTENTIALLY BREAKING CHANGE!
 - Changed: `serv.map(location)` 3rd parameter is now always `z` position (was `map` when received 3 arguments or `z` when received 4 arguments).

src/game/CWorldTicker.cpp

@@ -32,7 +32,7 @@ static void UnsortedVecDifference(
     ASSERT(vecElemBuffer.empty());
 
     // Reserve space in vecElemBuffer to avoid reallocations
-    vecElemBuffer.reserve(vecMain.size() - vecToRemoveUnsorted.size());
+    vecElemBuffer.reserve(vecMain.size());
 
     /*
     // IMPLEMENTATION 1: linear, no bulk insertions
@@ -116,14 +116,10 @@ static void SortedVecRemoveAddQueued(
     ASSERT(!sl::SortedContainerHasDuplicates(vecToAdd));
 #endif
 
-    if (!vecToRemoveUnsorted.empty())
+    if (!vecToRemoveUnsorted.empty() && !vecMain.empty())
     {
-        if (vecMain.empty()) {
-            ASSERT(false);  // Shouldn't ever happen.
-        }
-
         vecElemBuffer.clear();
-        vecElemBuffer.reserve(vecMain.size() - vecToRemoveUnsorted.size());
+        vecElemBuffer.reserve(vecMain.size());
 
         // Unsorted custom algorithm.
         // We can't use a classical sorted algorithm because vecMain is sorted by pair.first (int64 timeout)
@@ -355,6 +351,7 @@ bool CWorldTicker::_EraseTimedObject(CTimedObject* pTimedObject)
     {
         // It isn't in the ticking list, or we already have received a remove request.
         ASSERT(false);  // Not legit.
+        return false;
     }
 
 #ifdef DEBUG_CTIMEDOBJ_TIMED_TICKING
@@ -625,6 +622,12 @@ bool CWorldTicker::_EraseCharTicking(CChar* pChar)
     }
 #endif
 
+    if (_vPeriodicCharsEraseRequests.cend() !=
+        std::find(_vPeriodicCharsEraseRequests.cbegin(), _vPeriodicCharsEraseRequests.cend(), pChar))
+    {
+        return true;
+    }
+
     _vPeriodicCharsEraseRequests.emplace_back(pChar);
 
     return true;
@@ -1316,6 +1319,8 @@ void CWorldTicker::ProcessCharPeriodicTicks()
                 if (pChar->_IsSleeping() || pChar->_IsBeingDeleted())
                     continue;
 
+                pChar->_iTimePeriodicTick = 0;
+
                 _vPeriodicCharsTicksBuffer.emplace_back(pChar);
                 _vIndexMiscBuffer.emplace_back(uiProgressive);
             }
@@ -1350,7 +1355,11 @@ void CWorldTicker::ProcessCharPeriodicTicks()
         EXC_TRYSUB("Char Periodic Ticks Loop");
         for (CChar* pChar : _vPeriodicCharsTicksBuffer)    // Loop through all msecs stored, unless we passed the timestamp.
         {
-            pChar->_iTimePeriodicTick = 0;
+            if (pChar->_IsBeingDeleted() || pChar->_IsSleeping())
+            {
+                continue;
+            }
+
             if (pChar->OnTickPeriodic())
             {
                 if (!pChar->IsPeriodicTickPending())

src/game/chars/CCharAct.cpp

@@ -3126,7 +3126,8 @@ bool CChar::ItemBounce( CItem * pItem, bool fDisplayMsg )
 			}
 		}
 	}
-	else if ( pItem->GetEquipLayer() > LAYER_NONE && pItem->GetEquipLayer() <= LAYER_LEGS) //If we are overweight, we don't want our equipped items to fall on the ground. They will remain equipped.
+    // Item is equipped (armor / weapon), char is overweight and optional flag OWNoDropCarriedItem is enabled, so we keep it equipped.
+	else if (pItem->GetEquipLayer() > LAYER_NONE && pItem->GetEquipLayer() <= LAYER_LEGS && IsSetOF(OF_OWNoDropCarriedItem))
 	{
 		SysMessageDefault(DEFMSG_MSG_HEAVY);
 		return false;
@@ -3142,6 +3143,7 @@ bool CChar::ItemBounce( CItem * pItem, bool fDisplayMsg )
 	}
 	else if (fDropOnGround)
 	{
+	    // @todo This duplicates CItem::MoveToCheck() almost exactly.
 		if ( !GetTopPoint().IsValidPoint() )
 		{
 			// NPC is being created and has no valid point yet.
@@ -3157,6 +3159,14 @@ bool CChar::ItemBounce( CItem * pItem, bool fDisplayMsg )
         const CObjBase* pItemContPrev = pItem->GetContainer();
         int64 iDecayTime = pItem->GetDecayTime();
         CPointMap ptDrop(GetTopPoint());
+
+	    if ( iDecayTime > 0 )
+	    {
+	        const CRegion * pRegion = ptDrop.GetRegion(REGION_TYPE_MULTI|REGION_TYPE_AREA|REGION_TYPE_ROOM);
+	        if ( pRegion != nullptr && pRegion->IsFlag(REGION_FLAG_NODECAY) )
+	            iDecayTime = -1 * MSECS_PER_SEC;
+	    }
+
         TRIGRET_TYPE ttResult = TRIGRET_RET_DEFAULT;
         if (IsTrigUsed(TRIGGER_DROPON_GROUND) || IsTrigUsed(TRIGGER_ITEMDROPON_GROUND))
         {

src/game/chars/CCharStat.cpp

@@ -209,7 +209,10 @@ void CChar::Stat_AddVal( STAT_TYPE i, int iVal )
 
     if ((i == STAT_STR) && (iVal <= 0))
     {   // Ensure this char will tick and die
-		CWorldTickingList::AddCharPeriodic(this, false);
+        if (!IsPeriodicTickPending())
+        {
+            CWorldTickingList::AddCharPeriodic(this, false);
+        }
     }
 }
 

src/game/clients/CClientMsg.cpp

@@ -2929,8 +2929,9 @@ byte CClient::Setup_Play( uint iSlot ) // After hitting "Play Character" button
 	if ( pCharLast && pAccount->IsMyAccountChar( pCharLast ) && pAccount->GetPrivLevel() <= PLEVEL_GM &&
 		! pCharLast->IsDisconnected() && (pChar->GetUID() != pCharLast->GetUID()))
 	{
+	    // Login was successful, display warning only.
 		addIdleWarning(PacketWarningMessage::CharacterInWorld);
-		return(PacketLoginError::CharIdle);
+		return PacketLoginError::Success;
 	}
 
 	// LastLogged update