Fix AllowCave option

RestoreMonarchyPlugins · Sep 6, 2024 · 4147e4e · 4147e4e
1 parent 980802b
commit 4147e4e
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 40 deletions.
diff --git a/Teleportation/Teleportation.csproj b/Teleportation/Teleportation.csproj
@@ -4,46 +4,11 @@
 		<TargetFramework>net48</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>RestoreMonarchy.Teleportation</RootNamespace>
-		<Version>1.7.0</Version>
+		<Version>1.8.0</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <Reference Include="Assembly-CSharp">
-	    <HintPath>..\lib\Assembly-CSharp.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="com.rlabrecque.steamworks.net">
-	    <HintPath>..\lib\com.rlabrecque.steamworks.net.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="Newtonsoft.Json">
-	    <HintPath>..\lib\Newtonsoft.Json.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="Rocket.API">
-	    <HintPath>..\lib\Rocket.API.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="Rocket.Core">
-	    <HintPath>..\lib\Rocket.Core.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="Rocket.Unturned">
-	    <HintPath>..\lib\Rocket.Unturned.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="SDG.NetTransport">
-	    <HintPath>..\lib\SDG.NetTransport.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="UnityEngine">
-	    <HintPath>..\lib\UnityEngine.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
-	  <Reference Include="UnityEngine.CoreModule">
-	    <HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
-	    <Private>False</Private>
-	  </Reference>
+	  <PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.24.5.1" ExcludeAssets="runtime" />
 	</ItemGroup>
 
 </Project>
diff --git a/Teleportation/TeleportationConfiguration.cs b/Teleportation/TeleportationConfiguration.cs
@@ -30,6 +30,7 @@ public void LoadDefaults()
             CombatDuration = 20;
             UseUnsafeTeleport = false;
             CancelOnMove = true;
+            MoveMaxDistance = 0.5f;
         }
     }
 }
diff --git a/Teleportation/Utils/TeleportationPluginExtensions.cs b/Teleportation/Utils/TeleportationPluginExtensions.cs
@@ -105,12 +105,14 @@ public static bool IsPlayerInCave(this TeleportationPlugin plugin, UnturnedPlaye
             if (!plugin.Configuration.Instance.AllowCave)
             {
                 Vector3 point = Vector3.zero;
-                UndergroundAllowlist.AdjustPosition(ref point, 0.5f, 1f);
-                if (point != player.Position)
+
+                float height = LevelGround.getHeight(point);
+                if (height > point.y)
                 {
                     return true;
                 }
             }
+
             return false;
         }
     }

diff --git a/Teleportation/Utils/TeleportationRequestHelper.cs b/Teleportation/Utils/TeleportationRequestHelper.cs
@@ -57,7 +57,7 @@ public static void AcceptTPARequest(this TeleportationPlugin plugin, UnturnedPla
                 return;
             }
 
-            UnturnedChat.Say(caller, plugin.Translate("TPAAccepted", request.SenderPlayer.CharacterName, plugin.MessageColor));
+            UnturnedChat.Say(caller, plugin.Translate("TPAAccepted", request.SenderPlayer.CharacterName), plugin.MessageColor);
             request.Execute(plugin.Configuration.Instance.TPADelay);
             plugin.TPRequests.Remove(request);
         }

diff --git a/lib/Assembly-CSharp.dll b/lib/Assembly-CSharp.dll
diff --git a/lib/Newtonsoft.Json.dll b/lib/Newtonsoft.Json.dll
diff --git a/lib/Rocket.API.dll b/lib/Rocket.API.dll
diff --git a/lib/Rocket.Core.dll b/lib/Rocket.Core.dll
diff --git a/lib/Rocket.Unturned.dll b/lib/Rocket.Unturned.dll
diff --git a/lib/SDG.NetTransport.dll b/lib/SDG.NetTransport.dll
diff --git a/lib/UnityEngine.CoreModule.dll b/lib/UnityEngine.CoreModule.dll
diff --git a/lib/UnityEngine.PhysicsModule.dll b/lib/UnityEngine.PhysicsModule.dll
diff --git a/lib/UnityEngine.dll b/lib/UnityEngine.dll
diff --git a/lib/com.rlabrecque.steamworks.net.dll b/lib/com.rlabrecque.steamworks.net.dll