Changeset 443 for binary-improvements/7dtd-server-fixes

Timestamp:

Jun 10, 2023, 5:47:43 PM (17 months ago)

Author:

alloc

Message:

23_26_40 (A21)

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (1 diff)
• ModInfo.xml (modified) (1 diff)
• src/API.cs (modified) (1 diff)
• src/PersistentData/Player.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -11 +11 @@
     <RootNamespace>AllocsFixes</RootNamespace>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <LangVersion>9</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="25" />
+                <Version value="26" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/7dtd-server-fixes/src/API.cs

@@ -23 +23 @@
 
                 public void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
-                        PersistentContainer.Instance.Players [_cInfo.InternalId, true].Update (_playerDataFile);
+                        PersistentContainer.Instance.Players [_cInfo.InternalId, true].Update (_cInfo, _playerDataFile);
                 }
 

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -141 +141 @@
                 }
 
-                public void Update (PlayerDataFile _pdf) {
-                        UpdateProgression (_pdf);
+                public void Update (ClientInfo _clientInfo, PlayerDataFile _pdf) {
+                        UpdateProgression (_clientInfo, _pdf);
                         inventory.Update (_pdf);
                 }
 
-                private void UpdateProgression (PlayerDataFile _pdf) {
+                private void UpdateProgression (ClientInfo _clientInfo, PlayerDataFile _pdf) {
                         if (_pdf.progressionData.Length <= 0) {
                                 return;
                         }
 
-                        using (PooledBinaryReader pbr = MemoryPools.poolBinaryReader.AllocSync (false)) {
-                                pbr.SetBaseStream (_pdf.progressionData);
-                                long posBefore = pbr.BaseStream.Position;
-                                pbr.BaseStream.Position = 0;
-                                Progression p = Progression.Read (pbr, null);
-                                pbr.BaseStream.Position = posBefore;
-                                expToNextLevel = (uint) p.ExpToNextLevel;
-                                level = p.Level;
+                        if (!GameManager.Instance.World.Entities.dict.TryGetValue (_clientInfo.entityId, out Entity entity)) {
+                                return;
                         }
+
+                        if (entity is not EntityPlayer ep) {
+                                return;
+                        }
+
+                        expToNextLevel = (uint)ep.Progression.ExpToNextLevel;
+                        level = ep.Progression.Level;
                 }