Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PopupSystem public methods rejig (#12830)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 10:41:47 +13:00
committed by GitHub
parent e459452333
commit 881a2b2ece
164 changed files with 721 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
View File

@@ -110,11 +110,11 @@ public sealed partial class EnsnareableSystem
_doAfter.DoAfter(doAfterEventArgs);
if (isOwner)
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free", ("ensnare", component.Owner)), target, Filter.Entities(target));
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free", ("ensnare", component.Owner)), target, target);
if (!isOwner && user != null)
{
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-other", ("ensnare", component.Owner), ("user", Identity.Entity(target, EntityManager))), user.Value, Filter.Entities(user.Value));
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-other", ("ensnare", component.Owner), ("user", Identity.Entity(target, EntityManager))), user.Value, user.Value);
}
}

4
Content.Server/Ensnaring/EnsnareableSystem.cs
View File

@@ -41,7 +41,7 @@ public sealed partial class EnsnareableSystem : SharedEnsnareableSystem
ensnaring.Ensnared = null;
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-complete", ("ensnare", args.EnsnaringEntity)),
uid, Filter.Entities(uid), PopupType.Large);
uid, uid, PopupType.Large);
UpdateAlert(component);
var ev = new EnsnareRemoveEvent();
@@ -58,6 +58,6 @@ public sealed partial class EnsnareableSystem : SharedEnsnareableSystem
ensnaring.CancelToken = null;
_popup.PopupEntity(Loc.GetString("ensnare-component-try-free-fail", ("ensnare", args.EnsnaringEntity)),
uid, Filter.Entities(uid), PopupType.Large);
uid, uid, PopupType.Large);
}
}