From 8be13bf4955b43221c6537986dd4a72b4b87ebdb Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 20 Jul 2024 03:23:46 +0000 Subject: [PATCH] fix fish petting misprediction (#30175) * make fish petting ignore use delay * m * troll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Friends/Systems/PettableFriendSystem.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs index 00a4ddd155..6e41f4bdea 100644 --- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs +++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs @@ -32,23 +32,23 @@ public sealed class PettableFriendSystem : EntitySystem { var (uid, comp) = ent; var user = args.User; - if (args.Handled || !_exceptionQuery.TryGetComponent(uid, out var exceptionComp)) - return; - - if (_useDelayQuery.TryGetComponent(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true)) + if (args.Handled || !_exceptionQuery.TryComp(uid, out var exceptionComp)) return; var exception = (uid, exceptionComp); - if (_factionException.IsIgnored(exception, user)) + if (!_factionException.IsIgnored(exception, user)) { - _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user); + // you have made a new friend :) + _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user); + _factionException.IgnoreEntity(exception, user); + args.Handled = true; return; } - // you have made a new friend :) - _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user); - _factionException.IgnoreEntity(exception, user); - args.Handled = true; + if (_useDelayQuery.TryComp(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true)) + return; + + _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user); } private void OnRehydrated(Entity ent, ref GotRehydratedEvent args) -- 2.51.2