Merge pull request #464 from PhantomGamers/pr-0.7.1

0.7.1 with DSP 0.8.22.9331 support
NebulaModTeam · Oct 29, 2021 · a86d9c0 · a86d9c0
2 parents caa87ee + 2f7bcb1
commit a86d9c0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Changelog
 
+0.7.1:
+
+- @starfi5h: Fixed research desync issues
+- @sp00ktober: Fixed error when client upgrades buildings on different planet from the host.
+- @PhantomGamers: Fixed compatibility with DSP 0.8.22.9331+
+
 0.7.0:
 
 - @phantomgamers: Fixed instance where error would trigger by loading saves made on earlier Nebula versions. **WARNING: All previous client inventory and position data will be lost!** (should be for the last time!)

diff --git a/NebulaWorld/RemotePlayerModel.cs b/NebulaWorld/RemotePlayerModel.cs
@@ -50,6 +50,7 @@ public RemotePlayerModel(ushort playerId, string username)
             PlayerTransform.gameObject.name = $"Remote Player ({playerId})";
 
             PlayerInstance = new global::Player();
+            PlayerInstance.transform = PlayerTransform;
             MechaInstance = new Mecha();
             PlayerInstance.mecha = MechaInstance;
             MechaInstance.Init(PlayerInstance);
@@ -59,6 +60,11 @@ public RemotePlayerModel(ushort playerId, string username)
             Material mat = MechaInstance.droneRenderer.mat_0;
             mat.CopyPropertiesFromMaterial(Configs.builtin.mechaDroneMat);
 
+            //Fix MechaArmorModel
+            PlayerInstance.mechaArmorModel = PlayerTransform.GetComponentInChildren<MechaArmorModel>();
+            PlayerInstance.mechaArmorModel.player = PlayerInstance;
+            PlayerInstance.mechaArmorModel.mecha = MechaInstance;
+
             PlayerId = playerId;
             Username = username;
         }

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "assemblyVersion": {
     "precision": "build"
   },