mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-26 18:35:34 +00:00
Code Issues Projects Releases Wiki Activity

disable collision from triggering impact code on clients

Browse Source
This commit is contained in:
JohnCorby 2021-11-11 02:16:14 -08:00
parent 5f5e04e29f
commit 51402612a1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QSB/MeteorSync/Patches/MeteorClientPatches.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using HarmonyLib; using HarmonyLib;
using OWML.Common;
using QSB.MeteorSync.WorldObjects; using QSB.MeteorSync.WorldObjects;
using QSB.Patches; using QSB.Patches;
using QSB.Utility; using QSB.Utility;
@ -105,6 +104,13 @@ namespace QSB.MeteorSync.Patches
} }
[HarmonyPrefix]
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.OnCollisionEnter))]
public static bool OnCollisionEnter(MeteorController __instance,
Collision collision)
=> false;
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Impact))] [HarmonyPatch(typeof(MeteorController), nameof(MeteorController.Impact))]
public static bool Impact(MeteorController __instance, public static bool Impact(MeteorController __instance,

3
QSB/MeteorSync/WorldObjects/QSBMeteor.cs
View File

@ -43,8 +43,6 @@ namespace QSB.MeteorSync.WorldObjects
impactPoint = Locator._brittleHollow.transform.TransformPoint(impactPoint); impactPoint = Locator._brittleHollow.transform.TransformPoint(impactPoint);
Damage = damage; Damage = damage;
AttachedObject.transform.position = impactPoint;
var hits = Physics.OverlapSphere(impactPoint, 1, OWLayerMask.physicalMask, QueryTriggerInteraction.Ignore); var hits = Physics.OverlapSphere(impactPoint, 1, OWLayerMask.physicalMask, QueryTriggerInteraction.Ignore);
var obj = hits var obj = hits
.Select(x => x.gameObject) .Select(x => x.gameObject)
@ -56,6 +54,7 @@ namespace QSB.MeteorSync.WorldObjects
return; return;
} }
AttachedObject.owRigidbody.MoveToPosition(impactPoint);
var impactVel = AttachedObject.owRigidbody.GetVelocity() - obj.GetAttachedOWRigidbody().GetVelocity(); var impactVel = AttachedObject.owRigidbody.GetVelocity() - obj.GetAttachedOWRigidbody().GetVelocity();
AttachedObject.Impact(obj, impactPoint, impactVel); AttachedObject.Impact(obj, impactPoint, impactVel);