From c358602e7117de1027bbf66b69444fd9315cb881 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 4 Mar 2022 03:29:26 -0800 Subject: [PATCH] Revert "Update QSBItem.cs" This reverts commit 3a79fce3 --- QSB/ItemSync/WorldObjects/Items/QSBItem.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/QSB/ItemSync/WorldObjects/Items/QSBItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBItem.cs index 80abc39b..723c71bb 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBItem.cs @@ -9,7 +9,7 @@ using UnityEngine; namespace QSB.ItemSync.WorldObjects.Items; -public class QSBItem : WorldObject, IQSBItem +internal class QSBItem : WorldObject, IQSBItem where T : OWItem { private QSBItemSocket InitialSocket { get; set; } @@ -85,13 +85,15 @@ public class QSBItem : WorldObject, IQSBItem public void PickUpItem(Transform holdTransform) => AttachedObject.PickUpItem(holdTransform); - public virtual void DropItem(Vector3 position, Vector3 normal, Sector sector) + public void DropItem(Vector3 position, Vector3 normal, Sector sector) { AttachedObject.transform.SetParent(sector.transform); AttachedObject.transform.localScale = Vector3.one; - var lhs = Quaternion.FromToRotation(AttachedObject.transform.TransformDirection(AttachedObject._localDropNormal), normal); + var localDropNormal = AttachedObject._localDropNormal; + var lhs = Quaternion.FromToRotation(AttachedObject.transform.TransformDirection(localDropNormal), normal); AttachedObject.transform.rotation = lhs * AttachedObject.transform.rotation; - AttachedObject.transform.position = position + AttachedObject.transform.TransformDirection(AttachedObject._localDropOffset); + var localDropOffset = AttachedObject._localDropOffset; + AttachedObject.transform.position = sector.transform.TransformPoint(position) + AttachedObject.transform.TransformDirection(localDropOffset); AttachedObject.SetSector(sector); AttachedObject.SetColliderActivation(true); }