Merge pull request #72 from urlordjames/master

fixed multiple bugs
SubnauticaNitrox · Jan 17, 2018 · 1cd3d28 · 1cd3d28
2 parents fb775dd + 6e9bf3a
commit 1cd3d28
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/NitroxClient/Communication/DeferringPacketReceiver.cs b/NitroxClient/Communication/DeferringPacketReceiver.cs
@@ -13,7 +13,7 @@ public class DeferringPacketReceiver
         private const int DESIRED_CELL_MIN_LOD_FOR_ACTIONS = 1;
 
         private readonly Dictionary<AbsoluteEntityCell, Queue<Packet>> deferredPacketsByAbsoluteCell = new Dictionary<AbsoluteEntityCell, Queue<Packet>>();
-        private readonly PriorityQueue<Packet> receivedPackets = new PriorityQueue<Packet>();
+        private readonly NitroxModel.DataStructures.PriorityQueue<Packet> receivedPackets = new NitroxModel.DataStructures.PriorityQueue<Packet>();  //sry stole your fix
         private readonly VisibleCells visibleCells;
 
         public DeferringPacketReceiver(VisibleCells visibleCells)

diff --git a/NitroxClient/GameLogic/RemotePlayer.cs b/NitroxClient/GameLogic/RemotePlayer.cs
@@ -40,7 +40,8 @@ public RemotePlayer(string playerId)
 
             //Move variables to keep player animations from mirroring and for identification
             ArmsController = PlayerView.GetComponent<ArmsController>();
-            ArmsController.smoothSpeed = 0;
+            ArmsController.smoothSpeedUnderWater = 0;
+            ArmsController.smoothSpeedAboveWater = 0;
 
             //Sets up a copy from the xSignal template for the signal
             //todo: settings menu to disable this?

diff --git a/NitroxPatcher/Patches/ArmsController_Update_Patch.cs b/NitroxPatcher/Patches/ArmsController_Update_Patch.cs
@@ -17,13 +17,13 @@ public class ArmsController_Update_Patch : NitroxPatch
         private static readonly FieldInfo reconfigureWorldTarget = TARGET_CLASS.GetField("reconfigureWorldTarget", BindingFlags.NonPublic | BindingFlags.Instance);
         private static readonly MethodInfo reconfigure = TARGET_CLASS.GetMethod("Reconfigure", BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static readonly Type ArmAiming = TARGET_CLASS.GetNestedType("ArmAiming", BindingFlags.NonPublic);
-        private static readonly MethodInfo armAimingUpdate = ArmAiming.GetMethod("Update", BindingFlags.Public | BindingFlags.Instance);
+        private static readonly Type armAiming = TARGET_CLASS.GetNestedType("armAiming", BindingFlags.NonPublic);
+        private static readonly MethodInfo armAimingUpdate = armAiming.GetMethod("Update", BindingFlags.Public | BindingFlags.Instance);
         private static readonly MethodInfo updateHandIKWeights = TARGET_CLASS.GetMethod("UpdateHandIKWeights", BindingFlags.NonPublic | BindingFlags.Instance);
 
         public static bool Prefix(ArmsController __instance)
         {
-            if (__instance.smoothSpeed == 0)
+            if (__instance.smoothSpeedAboveWater == 0)
             {
                 if ((bool)reconfigureWorldTarget.GetValue(__instance))
                 {

diff --git a/NitroxTest/Model/PriorityQueueTest.cs b/NitroxTest/Model/PriorityQueueTest.cs
@@ -10,7 +10,7 @@ public class PriorityQueueTest
         [TestMethod]
         public void SameOrder()
         {
-            PriorityQueue<string> queue = new PriorityQueue<string>();
+            NitroxModel.DataStructures.PriorityQueue<string> queue = new NitroxModel.DataStructures.PriorityQueue<string>();
             queue.Enqueue(0, "First");
             queue.Enqueue(0, "Second");
             queue.Enqueue(0, "Third");
@@ -23,7 +23,7 @@ public void SameOrder()
         [TestMethod]
         public void DifferentOrder()
         {
-            PriorityQueue<string> queue = new PriorityQueue<string>();
+            NitroxModel.DataStructures.PriorityQueue<string> queue = new NitroxModel.DataStructures.PriorityQueue<string>();
             queue.Enqueue(3, "First");
             queue.Enqueue(2, "Second");
             queue.Enqueue(1, "Third");
@@ -36,7 +36,7 @@ public void DifferentOrder()
         [TestMethod]
         public void SomeAreSameOrder()
         {
-            PriorityQueue<string> queue = new PriorityQueue<string>();
+            NitroxModel.DataStructures.PriorityQueue<string> queue = new NitroxModel.DataStructures.PriorityQueue<string>();
             queue.Enqueue(2, "First");
             queue.Enqueue(2, "Second");
             queue.Enqueue(0, "Third");
@@ -49,7 +49,7 @@ public void SomeAreSameOrder()
         [TestMethod]
         public void PrioritySanity()
         {
-            PriorityQueue<string> queue = new PriorityQueue<string>();
+            NitroxModel.DataStructures.PriorityQueue<string> queue = new NitroxModel.DataStructures.PriorityQueue<string>();
             queue.Enqueue(2, "Second");
             queue.Enqueue(3, "First");
             queue.Enqueue(1, "Third");
@@ -62,7 +62,7 @@ public void PrioritySanity()
         [TestMethod]
         public void CountSanity()
         {
-            PriorityQueue<string> queue = new PriorityQueue<string>();
+            NitroxModel.DataStructures.PriorityQueue<string> queue = new NitroxModel.DataStructures.PriorityQueue<string>();
             queue.Enqueue(2, "Second");
             queue.Enqueue(3, "First");
             queue.Enqueue(1, "Third");