13.1 question mark

Axwabo · Jun 26, 2023 · bc32909 · bc32909
1 parent 065cf44
commit bc32909
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/slocLoader.NWAPI/Properties/AssemblyInfo.cs b/slocLoader.NWAPI/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.1.0.0")]
+[assembly: AssemblyFileVersion("4.1.1.0")]
diff --git a/slocLoader.NWAPI/TriggerActions/Handlers/TriggerActionHelpers.cs b/slocLoader.NWAPI/TriggerActions/Handlers/TriggerActionHelpers.cs
@@ -1,4 +1,5 @@
 using InventorySystem.Items.Pickups;
+using InventorySystem.Items.ThrowableProjectiles;
 using Mirror;
 using PlayerRoles.FirstPersonControl;
 using slocLoader.TriggerActions.Enums;
@@ -23,8 +24,15 @@ public static void ResetVelocityOfPickup(ItemPickupBase pickup, TeleportOptions
     {
         if (!options.Is(TeleportOptions.ResetVelocity))
             return;
-        pickup._estimatedVelocity = Vector3.zero;
-        pickup.RigidBody.velocity = Vector3.zero;
+        switch (pickup.PhysicsModule)
+        {
+            case PickupStandardPhysics physics:
+                physics.Rb.velocity = Vector3.zero;
+                break;
+            case Scp018Physics scp018:
+                scp018._lastVelocity = Vector3.zero;
+                break;
+        }
     }
 
     public static bool TryGetMovementModule(this ReferenceHub hub, out FirstPersonMovementModule module)

diff --git a/slocLoader.NWAPI/slocPlugin.cs b/slocLoader.NWAPI/slocPlugin.cs
@@ -15,7 +15,7 @@ public sealed class slocPlugin
     [PluginConfig]
     public slocConfig Config = new();
 
-    [PluginEntryPoint("slocLoader", "4.1.0", "A plugin that loads sloc files.", "Axwabo")]
+    [PluginEntryPoint("slocLoader", "4.1.1", "A plugin that loads sloc files.", "Axwabo")]
     public void OnEnabled()
     {
         Instance = this;

diff --git a/slocLoader/Properties/AssemblyInfo.cs b/slocLoader/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.1.0.0")]
+[assembly: AssemblyFileVersion("4.1.1.0")]
diff --git a/slocLoader/TriggerActions/Handlers/TriggerActionHelpers.cs b/slocLoader/TriggerActions/Handlers/TriggerActionHelpers.cs
@@ -1,4 +1,5 @@
 using InventorySystem.Items.Pickups;
+using InventorySystem.Items.ThrowableProjectiles;
 using Mirror;
 using PlayerRoles.FirstPersonControl;
 using slocLoader.TriggerActions.Enums;
@@ -23,8 +24,15 @@ public static void ResetVelocityOfPickup(ItemPickupBase pickup, TeleportOptions
     {
         if (!options.Is(TeleportOptions.ResetVelocity))
             return;
-        pickup._estimatedVelocity = Vector3.zero;
-        pickup.RigidBody.velocity = Vector3.zero;
+        switch (pickup.PhysicsModule)
+        {
+            case PickupStandardPhysics physics:
+                physics.Rb.velocity = Vector3.zero;
+                break;
+            case Scp018Physics scp018:
+                scp018._lastVelocity = Vector3.zero;
+                break;
+        }
     }
 
     public static bool TryGetMovementModule(this ReferenceHub hub, out FirstPersonMovementModule module)

diff --git a/slocLoader/slocPlugin.cs b/slocLoader/slocPlugin.cs
@@ -13,7 +13,7 @@ public sealed class slocPlugin : Plugin<slocConfig>
     public override string Name => "slocLoader";
     public override string Prefix => "sloc";
     public override string Author => "Axwabo";
-    public override Version Version { get; } = new(4, 1, 0);
+    public override Version Version { get; } = new(4, 1, 1);
     public override Version RequiredExiledVersion { get; } = new(7, 0, 0);
 
     private Harmony _harmony;