tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes store purchase events and adds support to raise a directed event (#26389)

Browse Source 
* fixes store event check

* raise directed product event
This commit is contained in:
keronshb
2024-03-24 14:07:05 -04:00
committed by GitHub
parent 0303e9cb36
commit 4dced51f0d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Store/Systems/StoreSystem.Ui.cs
View File

@@ -249,10 +249,12 @@ public sealed partial class StoreSystem
HandleRefundComp(uid, component, upgradeActionId.Value); HandleRefundComp(uid, component, upgradeActionId.Value);
} }
//broadcast event
if (listing.ProductEvent != null) if (listing.ProductEvent != null)
{ {
if (!listing.RaiseProductEventOnUser)
RaiseLocalEvent(listing.ProductEvent); RaiseLocalEvent(listing.ProductEvent);
else
RaiseLocalEvent(buyer, listing.ProductEvent);
} }
//log dat shit. //log dat shit.

5
Content.Shared/Store/ListingPrototype.cs
View File

@@ -98,6 +98,9 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
[DataField("productEvent")] [DataField("productEvent")]
public object? ProductEvent; public object? ProductEvent;
[DataField]
public bool RaiseProductEventOnUser;
/// <summary> /// <summary>
/// used internally for tracking how many times an item was purchased. /// used internally for tracking how many times an item was purchased.
/// </summary> /// </summary>
@@ -120,7 +123,7 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
Description != listing.Description || Description != listing.Description ||
ProductEntity != listing.ProductEntity || ProductEntity != listing.ProductEntity ||
ProductAction != listing.ProductAction || ProductAction != listing.ProductAction ||
ProductEvent != listing.ProductEvent || ProductEvent?.GetType() != listing.ProductEvent?.GetType() ||
RestockTime != listing.RestockTime) RestockTime != listing.RestockTime)
return false; return false;