Merge pull request #91 from SynapseSL/development

Development

Author: Polyfish0

Refs/Assembly-CSharp-Publicized.dll

@@ -62,7 +62,7 @@ private static bool OnThrow(NetworkConnection conn, ThrowableNetworkHandler.Thro
                         bounds.Encapsulate(pos + player.PlayerMovementSync.PlayerVelocity * 0.2f);
                         player.CameraReference.position = bounds.ClosestPoint(msg.CameraPosition);
                         player.CameraReference.rotation = msg.CameraRotation;
-                        throwable.ServerThrow(msg.Request == ThrowableNetworkHandler.RequestType.ConfirmThrowFullForce);
+                        throwable.ServerThrow(msg.Request == ThrowableNetworkHandler.RequestType.ConfirmThrowFullForce, UnityEngine.Vector3.forward);
                         player.CameraReference.position = pos;
                         player.CameraReference.rotation = rot;
                         break;

Synapse/Patches/EventsPatches/PlayerPatches/PlayerThrowGrenadePatch.cs

@@ -10,6 +10,7 @@
 using UnityEngine;
 using EventHandler = Synapse.Api.Events.EventHandler;
 using Logger = Synapse.Api.Logger;
+using Random = UnityEngine.Random;
 
 namespace Synapse.Patches.EventsPatches.ScpPatches.Scp106
 {
@@ -136,9 +137,18 @@ private static bool TriggerEnter(PocketDimensionTeleport __instance, Collider ot
                     foreach(var player2 in Server.Get.Players)
                         if(player2.RoleType == RoleType.Scp106)
                         {
-                            var num = Vector3.Distance(player2.Position, __instance._gateBPDPosition);
-                            var num2 = Vector3.Distance(player2.Position,__instance._gateBPDPosition);
-                            pos = num2 < num ? __instance._gateBPDPosition : __instance._gateAPDPosition;
+                            Vector3 objPos = (player2 == null)
+                                ? Vector3.zero
+                                : player2.PlayerMovementSync.RealModelPosition;
+                            SafeTeleportPosition componentInChildren = identifier.GetComponentInChildren<SafeTeleportPosition>();
+                            float num = Vector3.Distance(objPos, componentInChildren.SafePositions[0].position);
+                            float num2 = Vector3.Distance(objPos, componentInChildren.SafePositions[1].position);
+                            player.PlayerMovementSync.OverridePosition((num2 < num) ? componentInChildren.SafePositions[0].position : componentInChildren.SafePositions[1].position, Random.value * 360f, false);
+                            
+                            
+                            // var num = Vector3.Distance(player2.Position, __instance._gateBPDPosition);
+                            // var num2 = Vector3.Distance(player2.Position,__instance._gateBPDPosition);
+                            // pos = num2 < num ? __instance._gateBPDPosition : __instance._gateAPDPosition;
                             break;
                         }
                 }
@@ -148,7 +158,7 @@ private static bool TriggerEnter(PocketDimensionTeleport __instance, Collider ot
                     hashSet.RemoveWhere((MapGeneration.RoomIdentifier room) => 
                     room.Name == MapGeneration.RoomName.Hcz106 || room.Name == MapGeneration.RoomName.EzGateA || 
                     room.Name == MapGeneration.RoomName.EzGateB || (room.Zone == MapGeneration.FacilityZone.LightContainment 
-                    && room.Shape == MapGeneration.RoomShape.Curve) || __instance.ProblemChildren.Contains(room.Name));
+                    && room.Shape == MapGeneration.RoomShape.Curve));
 
                     while (hashSet.Count > 0)
                     {

Synapse/Patches/EventsPatches/ScpPatches/Scp106/PocketDimensionPatches.cs

@@ -25,12 +25,7 @@ private static bool HitInidcatorFix(uint netId, float damage, Vector3 origin)
             }
             foreach (ReferenceHub referenceHub2 in referenceHub.spectatorManager.ServerCurrentSpectatingPlayers)
             {
-                referenceHub2.networkIdentity.connectionToClient.Send(new GunHitMessage
-                {
-                    Weapon = ItemType.None,
-                    Damage = (byte)Mathf.Round(damage * 2.5f),
-                    DamagePosition = origin
-                }, 0);
+                referenceHub2.networkIdentity.connectionToClient.Send(new GunHitMessage(false, damage, origin));
             }
             return false;
         }

Synapse/Patches/SynapsePatches/Dummy/ShootPatch.cs

@@ -9,18 +9,18 @@
 
 namespace Synapse.Patches.SynapsePatches.Item
 {
-    [HarmonyPatch(typeof(ThrowableItem),nameof(ThrowableItem.ServerThrow),new[] { typeof(float), typeof(float), typeof(Vector3)})]
+    [HarmonyPatch(typeof(ThrowableItem),nameof(ThrowableItem.ServerThrow),new[] { typeof(float), typeof(float), typeof(Vector3), typeof(Vector3)})]
     internal static class ServerThrowPatch
     {
         [HarmonyPrefix]
-        private static bool ServerThrow(ThrowableItem __instance, float forceAmount, float upwardFactor, Vector3 torque)
+        private static bool ServerThrow(ThrowableItem __instance, float forceAmount, float upwardFactor, Vector3 torque, Vector3 startVel)
         {
             try
             {
                 __instance._destroyTime = Time.timeSinceLevelLoad + __instance._postThrownAnimationTime;
                 __instance._alreadyFired = true;
-                var newpickup = UnityEngine.Object.Instantiate(__instance.Projectile
-                    , __instance.Owner.PlayerCameraReference.position, __instance.Owner.PlayerCameraReference.rotation);
+                var newpickup = UnityEngine.Object.Instantiate(__instance.Projectile,
+                    __instance.Owner.PlayerCameraReference.position, __instance.Owner.PlayerCameraReference.rotation);
 
                 var info = new PickupSyncInfo
                 {
@@ -37,7 +37,7 @@ private static bool ServerThrow(ThrowableItem __instance, float forceAmount, flo
                 NetworkServer.Spawn(newpickup.gameObject);
                 newpickup.InfoReceived(default, info);
                 if (newpickup.TryGetComponent<Rigidbody>(out var rb))
-                    __instance.PropelBody(rb, torque, forceAmount, upwardFactor);
+                    __instance.PropelBody(rb, torque, Vector3.zero, forceAmount, upwardFactor);
 
                 __instance.GetSynapseItem().Throwable.ThrowableItem = newpickup;
                 newpickup.ServerActivate();