Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

same to dev #2206

Merged
merged 3 commits into from
Nov 8, 2023
Merged

same to dev #2206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eac85c
fix `IAcquisitionConfirmationTrigger` logic
IRacle1 Nov 4, 2023
4085485
final 330 fix
IRacle1 Nov 7, 2023
22e744c
Merge branch 'dev' into fixesdev
louis1706 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Exiled.API/Features/Items/Scp330.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public Scp330(Scp330Bag itemBase)
internal Scp330()
: this((Scp330Bag)Server.Host.Inventory.CreateItemInstance(new(ItemType.SCP330, 0), false))
{
Base.Candies.Add(Scp330Candies.GetRandom());
}

/// <summary>
Expand Down Expand Up @@ -278,7 +279,6 @@ public override Item Clone()
internal override void ChangeOwner(Player oldOwner, Player newOwner)
{
Base.Owner = newOwner.ReferenceHub;
Base.ServerRefreshBag();
}
}
}
12 changes: 2 additions & 10 deletions Exiled.API/Features/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2461,19 +2461,11 @@ public Item AddItem(ItemBase itemBase, Item item = null)

item.ChangeOwner(item.Owner, this);

if (Inventory.isLocalPlayer && itemBase is IAcquisitionConfirmationTrigger acquisitionConfirmationTrigger)
if (itemBase is IAcquisitionConfirmationTrigger acquisitionConfirmationTrigger)
{
acquisitionConfirmationTrigger.ServerConfirmAcqusition();
acquisitionConfirmationTrigger.AcquisitionAlreadyReceived = true;
acquisitionConfirmationTrigger.AcquisitionAlreadyReceived = false;
}

// Dont care, didnt ask, ratio
Timing.CallDelayed(0.02f, () =>
{
if (item.Type is ItemType.SCP330 && item.Base != null)
((Scp330)item).Base.ServerRefreshBag();
});

ItemsValue.Add(item);

Inventory.SendItemsNextFrame = true;
Expand Down
Loading