Merge branch 'dev' into Item_move_fix

Author: Jhobean

.github/workflows/build_aux_files.yml

@@ -17,7 +17,7 @@ jobs:
 
     permissions:
       contents: write
-      actions: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_linux_x86.yml

@@ -145,6 +145,7 @@ jobs:
           name: Build-linux-x86
           merge-multiple: true
           run-id: ${{ github.run_id }}
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         env:
@@ -160,8 +161,8 @@ jobs:
     needs: linux-x86
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
     permissions:
-      contents: read
-      actions: write
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_linux_x86_64.yml

@@ -100,6 +100,7 @@ jobs:
           name: Build-linux-x86_64
           merge-multiple: true
           run-id: ${{ github.run_id }}
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         env:
@@ -114,8 +115,8 @@ jobs:
     needs: linux-x86_64
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
     permissions:
-      contents: read
-      actions: write
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_osx_arm.yml

@@ -90,6 +90,7 @@ jobs:
           name: Build-osx-arm64
           merge-multiple: true
           run-id: ${{ github.run_id }}
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         env:
@@ -105,8 +106,8 @@ jobs:
     needs: macos-arm64
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
     permissions:
-      contents: read
-      actions: write
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_osx_x86_64.yml

@@ -103,6 +103,9 @@ jobs:
   upload_selfhost_release:
     needs: macos-x86_64
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
+    permissions:
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_win_x86.yml

@@ -85,8 +85,8 @@ jobs:
     needs: windows-x86
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
     permissions:
-      contents: read
-      actions: write
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/build_win_x86_64.yml

@@ -84,8 +84,8 @@ jobs:
     needs: windows-x86_64
     if: contains(fromJson('["master", "main"]'), github.ref_name) && (github.repository == 'SphereServer/Source-X')
     permissions:
-      contents: read
-      actions: write
+      contents: write
+      actions: read
 
     runs-on: ubuntu-latest
     steps:

Changelog.txt

@@ -3659,7 +3659,7 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 - Added: @DelRedCandle trigger that triggers while red candle removing.
 	Args:
 	- I: Champion spawner uid.
-	- ARGO: Candle uid.
+	- ARGO: Candle uid. [Read Only]
 	- ARGN1: Reason of removing. [Read Only]
 		1: Timeout
 		2: User Command
@@ -3669,7 +3669,7 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 - Added: @DelWhiteCandle trigger that triggers while white candle removing.
 	Args:
 	- I: Champion spawner uid.
-	- ARGO: Candle uid.
+	- ARGO: Candle uid. [Read Only]
 	- ARGN1: Reason of removing. [Read Only]
 		1: Timeout
 		2: User Command
@@ -4064,13 +4064,20 @@ When setting a property like MORE to the a spell or skill defname, trying to rea
 - Changed: Login rejection (packet `0x82`) is now sent to all clients trying to log in (used to be only to clients, that Sphere could identify).
 
 03-11-2025, Nolok
-- Fixed: Corner cases issues with number parsing from scripts.
+- Fixed: Corner cases issues with number parsing from scripts (Issue #1448).
 - Fixed: Function call stack messed up ordering.
 - Fixed: Wrong script line pointed to in console log messages.
 - Fixed: Changing Char flags didn't always trigger a full update packet.
 - Fixed: Sector indexing issue.
 - Changed: Made both Windows and Linux load scripts in a folder in alphabetical order.
+- Added: "Old VarDef value..." log message when overwriting a DEF value during startup in debug builds (Issue #1437).
 
-11-11-2025, Jhobean
+17-11-2025, Nolok
+- Fixed: CAN_O_NOSLEEP was not considered/honored at server startup (Issue #1440).
+- Changed: Object timers are now saved in worldsave files as TIMERMS, to avoid ambiguity and reliance on git build number to determine if TIMER expressed a number in seconds or milliseconds.
+- Changed: Added 5 seconds timeout to DNS hostname resolution at startup (avoid getting stuck when connectivity is enabled but not working).
+- Changed: CANMASK formatted in worldsave files as hexadecimal number, instead of decimal.
+
+19-11-2025, Jhobean
 - Fixed: Full Tooltip now update each time you move an item manually (Issue #1500)
 - Fixed: On some situation when item was move or add on ground by script, decay flag and timer was not set. (Issue #1498)

src/CMakeSources.cmake

@@ -322,6 +322,7 @@ set(spherelibrary_S
     src/common/sphere_library/CSTime.cpp
     src/common/sphere_library/CSWindow.cpp
     src/common/sphere_library/smutex.cpp
+    src/common/sphere_library/snetwork.cpp
     src/common/sphere_library/sresetevents.cpp
     src/common/sphere_library/sstring.cpp
     src/common/sphere_library/sstringobjs.cpp
@@ -351,6 +352,7 @@ set(spherelibrary_H
     src/common/sphere_library/sfastmath.h
     src/common/sphere_library/smap.h
     src/common/sphere_library/smutex.h
+    src/common/sphere_library/snetwork.h
     src/common/sphere_library/sobjpool.h
     src/common/sphere_library/squeues.h
     src/common/sphere_library/sresetevents.h
@@ -382,7 +384,7 @@ set(game_S
     src/game/CResourceCalc.cpp
     src/game/CSector.cpp
     src/game/CSectorEnviron.cpp
-    src/game/CSectorTemplate.cpp
+    src/game/CSectorBase.cpp
     src/game/CSectorList.cpp
     src/game/CServer.cpp
     src/game/CServerConfig.cpp
@@ -422,7 +424,7 @@ set(game_H
     src/game/CScriptProfiler.h
     src/game/CSector.h
     src/game/CSectorEnviron.h
-    src/game/CSectorTemplate.h
+    src/game/CSectorBase.h
     src/game/CSectorList.h
     src/game/CServer.h
     src/game/CServerConfig.h

src/common/CRect.cpp

@@ -296,12 +296,12 @@ CSector * CRect::GetSectorAtIndex( int i ) const noexcept
     if (g_MapList.IsMapSupported(m_map) == false)
         return nullptr;
 
-    SectIndexingHints hints = PrecomputeSectorIndexingHints();
+    SectIndexingHints_s hints = PrecomputeSectorIndexingHints();
     return GetSectorAtIndexWithHints(i, hints);
 }
 
 // get the n-th sector that makes up this rect.
-CSector * CRect::GetSectorAtIndexWithHints(int i, SectIndexingHints hints) const noexcept
+CSector * CRect::GetSectorAtIndexWithHints(int i, SectIndexingHints_s hints) const noexcept
 {
     //if (g_MapList.IsMapSupported(m_map) == false)
     //    return nullptr;
@@ -327,7 +327,7 @@ CSector * CRect::GetSectorAtIndexWithHints(int i, SectIndexingHints hints) const
     return pSectors.GetSectorByIndexUnchecked(m_map, iSectorIndex);
 }
 
-CRect::SectIndexingHints
+CRect::SectIndexingHints_s
 CRect::PrecomputeSectorIndexingHints() const noexcept
 {
     const CSectorList &pSectors = CSectorList::Get();
@@ -367,7 +367,7 @@ CRect::PrecomputeSectorIndexingHints() const noexcept
     const int baseCol = rect.m_left >> uiSectorShift;
     const int iBase = CSectorList::CalcSectorIndex(iSectorCols, baseCol, baseRow);
 
-    return SectIndexingHints {
+    return SectIndexingHints_s {
         .iBaseSectorIndex = iBase,
         .iRectWidth = width,
         .iRectHeight = height,