mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-23 06:40:56 +00:00
Code Issues Projects Releases Wiki Activity

remove QSBItem.HoldingPlayer, as it wasn't always set

Browse Source
This commit is contained in:
JohnCorby 2022-01-26 00:30:13 -08:00
parent 20cf11dbdf
commit 1d7eb69dae
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/ItemSync/Messages/MoveToCarryMessage.cs
View File

@ -25,7 +25,7 @@ namespace QSB.ItemSync.Messages
ItemType.VisionTorch => player.VisionTorchSocket,
_ => player.ItemSocket,
};
WorldObject.PickUpItem(itemSocket, From);
WorldObject.PickUpItem(itemSocket);
}
}
}

11
QSB/ItemSync/WorldObjects/Items/QSBItem.cs
View File

@ -14,7 +14,6 @@ namespace QSB.ItemSync.WorldObjects.Items
public Vector3 InitialPosition { get; private set; }
public Quaternion InitialRotation { get; private set; }
public QSBSector InitialSector { get; private set; }
public uint HoldingPlayer { get; private set; }
public override void Init()
{
@ -57,7 +56,7 @@ namespace QSB.ItemSync.WorldObjects.Items
private void OnPlayerLeave(PlayerInfo player)
{
if (HoldingPlayer != player.PlayerId)
if (player.HeldItem != this)
{
return;
}
@ -84,11 +83,8 @@ namespace QSB.ItemSync.WorldObjects.Items
public ItemType GetItemType()
=> AttachedObject.GetItemType();
public void PickUpItem(Transform holdTransform, uint playerId)
{
AttachedObject.PickUpItem(holdTransform);
HoldingPlayer = playerId;
}
public void PickUpItem(Transform holdTransform)
=> AttachedObject.PickUpItem(holdTransform);
public void DropItem(Vector3 position, Vector3 normal, Sector sector)
{
@ -101,7 +97,6 @@ namespace QSB.ItemSync.WorldObjects.Items
AttachedObject.transform.position = sector.transform.TransformPoint(position) + AttachedObject.transform.TransformDirection(localDropOffset);
AttachedObject.SetSector(sector);
AttachedObject.SetColliderActivation(true);
HoldingPlayer = 0;
}
public void OnCompleteUnsocket()