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

Make raiselocalevent not broadcast by default (#8998)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-22 09:53:41 +10:00
committed by GitHub
parent 360a6b8b00
commit 8905996cfc
76 changed files with 165 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Shared.ActionBlocker
return false;
var ev = new UpdateCanMoveEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
if (component.CanMove == ev.Cancelled && component is Component comp)
Dirty(comp);
@@ -63,7 +63,7 @@ namespace Content.Shared.ActionBlocker
public bool CanInteract(EntityUid user, EntityUid? target)
{
var ev = new InteractionAttemptEvent(user, target);
RaiseLocalEvent(user, ev);
RaiseLocalEvent(user, ev, true);
if (ev.Cancelled)
return false;
@@ -72,7 +72,7 @@ namespace Content.Shared.ActionBlocker
return true;
var targetEv = new GettingInteractedWithAttemptEvent(user, target);
RaiseLocalEvent(target.Value, targetEv);
RaiseLocalEvent(target.Value, targetEv, true);
return !targetEv.Cancelled;
}
@@ -88,7 +88,7 @@ namespace Content.Shared.ActionBlocker
public bool CanUseHeldEntity(EntityUid user)
{
var ev = new UseAttemptEvent(user);
RaiseLocalEvent(user, ev);
RaiseLocalEvent(user, ev, true);
return !ev.Cancelled;
}
@@ -96,7 +96,7 @@ namespace Content.Shared.ActionBlocker
public bool CanThrow(EntityUid user)
{
var ev = new ThrowAttemptEvent(user);
RaiseLocalEvent(user, ev);
RaiseLocalEvent(user, ev, true);
return !ev.Cancelled;
}
@@ -104,7 +104,7 @@ namespace Content.Shared.ActionBlocker
public bool CanSpeak(EntityUid uid)
{
var ev = new SpeakAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -112,7 +112,7 @@ namespace Content.Shared.ActionBlocker
public bool CanDrop(EntityUid uid)
{
var ev = new DropAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -134,7 +134,7 @@ namespace Content.Shared.ActionBlocker
public bool CanEmote(EntityUid uid)
{
var ev = new EmoteAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -142,7 +142,7 @@ namespace Content.Shared.ActionBlocker
public bool CanAttack(EntityUid uid, EntityUid? target = null)
{
var ev = new AttackAttemptEvent(uid, target);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -150,7 +150,7 @@ namespace Content.Shared.ActionBlocker
public bool CanChangeDirection(EntityUid uid)
{
var ev = new ChangeDirectionAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -158,7 +158,7 @@ namespace Content.Shared.ActionBlocker
public bool CanShiver(EntityUid uid)
{
var ev = new ShiverAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}
@@ -166,7 +166,7 @@ namespace Content.Shared.ActionBlocker
public bool CanSweat(EntityUid uid)
{
var ev = new SweatAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
RaiseLocalEvent(uid, ev, true);
return !ev.Cancelled;
}

4
Content.Shared/Alert/AlertsSystem.cs
View File

@@ -182,13 +182,13 @@ public abstract class AlertsSystem : EntitySystem
protected virtual void HandleComponentShutdown(EntityUid uid, AlertsComponent component, ComponentShutdown args)
{
RaiseLocalEvent(uid, new AlertSyncEvent(uid));
RaiseLocalEvent(uid, new AlertSyncEvent(uid), true);
_metaSystem.RemoveFlag(uid, MetaDataFlags.EntitySpecific);
}
private void HandleComponentStartup(EntityUid uid, AlertsComponent component, ComponentStartup args)
{
RaiseLocalEvent(uid, new AlertSyncEvent(uid));
RaiseLocalEvent(uid, new AlertSyncEvent(uid), true);
_metaSystem.AddFlag(uid, MetaDataFlags.EntitySpecific);
}

8
Content.Shared/Body/Components/MechanismComponent.cs
View File

@@ -29,11 +29,11 @@ namespace Content.Shared.Body.Components
{
if (old.Body == null)
{
_entMan.EventBus.RaiseLocalEvent(Owner, new RemovedFromPartEvent(old));
_entMan.EventBus.RaiseLocalEvent(Owner, new RemovedFromPartEvent(old), true);
}
else
{
_entMan.EventBus.RaiseLocalEvent(Owner, new RemovedFromPartInBodyEvent(old.Body, old));
_entMan.EventBus.RaiseLocalEvent(Owner, new RemovedFromPartInBodyEvent(old.Body, old), true);
}
}
@@ -41,11 +41,11 @@ namespace Content.Shared.Body.Components
{
if (value.Body == null)
{
_entMan.EventBus.RaiseLocalEvent(Owner, new AddedToPartEvent(value));
_entMan.EventBus.RaiseLocalEvent(Owner, new AddedToPartEvent(value), true);
}
else
{
_entMan.EventBus.RaiseLocalEvent(Owner, new AddedToPartInBodyEvent(value.Body, value));
_entMan.EventBus.RaiseLocalEvent(Owner, new AddedToPartInBodyEvent(value.Body, value), true);
}
}
}

4
Content.Shared/Body/Components/SharedBodyPartComponent.cs
View File

@@ -261,7 +261,7 @@ namespace Content.Shared.Body.Components
foreach (var mechanism in _mechanisms)
{
_entMan.EventBus.RaiseLocalEvent(mechanism.Owner, new AddedToBodyEvent(body));
_entMan.EventBus.RaiseLocalEvent(mechanism.Owner, new AddedToBodyEvent(body), true);
}
}
@@ -276,7 +276,7 @@ namespace Content.Shared.Body.Components
foreach (var mechanism in _mechanisms)
{
_entMan.EventBus.RaiseLocalEvent(mechanism.Owner, new RemovedFromBodyEvent(old));
_entMan.EventBus.RaiseLocalEvent(mechanism.Owner, new RemovedFromBodyEvent(old), true);
}
}

4
Content.Shared/CharacterAppearance/Systems/SharedHumanoidAppearanceSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Shared.CharacterAppearance.Systems
component.Dirty();
RaiseLocalEvent(uid, new ChangedHumanoidAppearanceEvent(appearance, sex, gender, species));
RaiseLocalEvent(uid, new ChangedHumanoidAppearanceEvent(appearance, sex, gender, species), true);
}
public void UpdateAppearance(EntityUid uid, HumanoidCharacterAppearance appearance, HumanoidAppearanceComponent? component = null)
@@ -54,7 +54,7 @@ namespace Content.Shared.CharacterAppearance.Systems
component.Dirty();
RaiseLocalEvent(uid, new ChangedHumanoidAppearanceEvent(appearance, component.Sex, component.Gender, component.Species));
RaiseLocalEvent(uid, new ChangedHumanoidAppearanceEvent(appearance, component.Sex, component.Gender, component.Species), true);
}
private void OnAppearanceGetState(EntityUid uid, HumanoidAppearanceComponent component, ref ComponentGetState args)

4
Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
View File

@@ -205,7 +205,7 @@ namespace Content.Shared.Containers.ItemSlots
PlaySound(uid, slot.InsertSound, slot.SoundOptions, excludeUserAudio ? user : null);
var ev = new ItemSlotChangedEvent();
RaiseLocalEvent(uid, ref ev);
RaiseLocalEvent(uid, ref ev, true);
}
/// <summary>
@@ -330,7 +330,7 @@ namespace Content.Shared.Containers.ItemSlots
PlaySound(uid, slot.EjectSound, slot.SoundOptions, excludeUserAudio ? user : null);
var ev = new ItemSlotChangedEvent();
RaiseLocalEvent(uid, ref ev);
RaiseLocalEvent(uid, ref ev, true);
}
/// <summary>

2
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -257,7 +257,7 @@ namespace Content.Shared.Examine
// Raise the event and let things that subscribe to it change the message...
var isInDetailsRange = IsInDetailsRange(examiner.Value, entity);
var examinedEvent = new ExaminedEvent(message, entity, examiner.Value, isInDetailsRange, doNewline);
RaiseLocalEvent(entity, examinedEvent);
RaiseLocalEvent(entity, examinedEvent, true);
message.Pop();

4
Content.Shared/Follower/FollowerSystem.cs
View File

@@ -79,7 +79,7 @@ public sealed class FollowerSystem : EntitySystem
var followerEv = new StartedFollowingEntityEvent(entity, follower);
var entityEv = new EntityStartedFollowingEvent(entity, follower);
RaiseLocalEvent(follower, followerEv);
RaiseLocalEvent(follower, followerEv, true);
RaiseLocalEvent(entity, entityEv, false);
}
@@ -107,7 +107,7 @@ public sealed class FollowerSystem : EntitySystem
var uidEv = new StoppedFollowingEntityEvent(target, uid);
var targetEv = new EntityStoppedFollowingEvent(target, uid);
RaiseLocalEvent(uid, uidEv);
RaiseLocalEvent(uid, uidEv, true);
RaiseLocalEvent(target, targetEv, false);
}

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
View File

@@ -158,7 +158,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
RaiseLocalEvent(entity, gotUnequipped, false);
var didUnequip = new DidUnequipHandEvent(uid, entity, hand);
RaiseLocalEvent(uid, didUnequip);
RaiseLocalEvent(uid, didUnequip, true);
if (hand == handsComp.ActiveHand)
RaiseLocalEvent(entity, new HandDeselectedEvent(uid), false);

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
View File

@@ -145,7 +145,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
RaiseLocalEvent(uid, didEquip, false);
var gotEquipped = new GotEquippedHandEvent(uid, entity, hand);
RaiseLocalEvent(entity, gotEquipped);
RaiseLocalEvent(entity, gotEquipped, true);
// TODO this should REALLY be a cancellable thing, not a handled event.
// If one of the interactions resulted in the item being dropped, return early.

14
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -280,7 +280,7 @@ namespace Content.Shared.Interaction
{
// all interactions should only happen when in range / unobstructed, so no range check is needed
var message = new InteractHandEvent(user, target);
RaiseLocalEvent(target, message);
RaiseLocalEvent(target, message, true);
_adminLogger.Add(LogType.InteractHand, LogImpact.Low, $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target}");
if (message.Handled)
return;
@@ -307,7 +307,7 @@ namespace Content.Shared.Interaction
if (target != null)
{
var rangedMsg = new RangedInteractEvent(user, used, target.Value, clickLocation);
RaiseLocalEvent(target.Value, rangedMsg);
RaiseLocalEvent(target.Value, rangedMsg, true);
if (rangedMsg.Handled)
return;
@@ -619,7 +619,7 @@ namespace Content.Shared.Interaction
// all interactions should only happen when in range / unobstructed, so no range check is needed
var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation);
RaiseLocalEvent(target, interactUsingEvent);
RaiseLocalEvent(target, interactUsingEvent, true);
if (interactUsingEvent.Handled)
return;
@@ -717,7 +717,7 @@ namespace Content.Shared.Interaction
return false;
var activateMsg = new ActivateInWorldEvent(user, used);
RaiseLocalEvent(used, activateMsg);
RaiseLocalEvent(used, activateMsg, true);
if (activateMsg.Handled)
{
_useDelay.BeginDelay(used, delayComponent);
@@ -766,7 +766,7 @@ namespace Content.Shared.Interaction
return false;
var useMsg = new UseInHandEvent(user);
RaiseLocalEvent(used, useMsg);
RaiseLocalEvent(used, useMsg, true);
if (useMsg.Handled)
{
_useDelay.BeginDelay(used, delayComponent);
@@ -805,7 +805,7 @@ namespace Content.Shared.Interaction
public void ThrownInteraction(EntityUid user, EntityUid thrown)
{
var throwMsg = new ThrownEvent(user, thrown);
RaiseLocalEvent(thrown, throwMsg);
RaiseLocalEvent(thrown, throwMsg, true);
if (throwMsg.Handled)
{
_adminLogger.Add(LogType.Throw, LogImpact.Low,$"{ToPrettyString(user):user} threw {ToPrettyString(thrown):entity}");
@@ -819,7 +819,7 @@ namespace Content.Shared.Interaction
public void DroppedInteraction(EntityUid user, EntityUid item)
{
var dropMsg = new DroppedEvent(user);
RaiseLocalEvent(item, dropMsg);
RaiseLocalEvent(item, dropMsg, true);
if (dropMsg.Handled)
_adminLogger.Add(LogType.Drop, LogImpact.Low, $"{ToPrettyString(user):user} dropped {ToPrettyString(item):entity}");
Transform(item).LocalRotation = Angle.Zero;

22
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -82,10 +82,10 @@ public abstract partial class InventorySystem
return;
var unequippedEvent = new DidUnequipEvent(uid, args.Entity, slotDef);
RaiseLocalEvent(uid, unequippedEvent);
RaiseLocalEvent(uid, unequippedEvent, true);
var gotUnequippedEvent = new GotUnequippedEvent(uid, args.Entity, slotDef);
RaiseLocalEvent(args.Entity, gotUnequippedEvent);
RaiseLocalEvent(args.Entity, gotUnequippedEvent, true);
}
private void OnEntInserted(EntityUid uid, InventoryComponent component, EntInsertedIntoContainerMessage args)
@@ -94,10 +94,10 @@ public abstract partial class InventorySystem
return;
var equippedEvent = new DidEquipEvent(uid, args.Entity, slotDef);
RaiseLocalEvent(uid, equippedEvent);
RaiseLocalEvent(uid, equippedEvent, true);
var gotEquippedEvent = new GotEquippedEvent(uid, args.Entity, slotDef);
RaiseLocalEvent(args.Entity, gotEquippedEvent);
RaiseLocalEvent(args.Entity, gotEquippedEvent, true);
}
/// <summary>
@@ -151,7 +151,7 @@ public abstract partial class InventorySystem
var gotUnequipped = new GotUnequippedHandEvent(actor, held.Value, hands.ActiveHand!);
var didUnequip = new DidUnequipHandEvent(actor, held.Value, hands.ActiveHand!);
RaiseLocalEvent(held.Value, gotUnequipped, false);
RaiseLocalEvent(actor, didUnequip);
RaiseLocalEvent(actor, didUnequip, true);
RaiseLocalEvent(held.Value, new HandDeselectedEvent(actor), false);
TryEquip(actor, actor, held.Value, ev.Slot, predicted: true, inventory: inventory, force: true);
@@ -274,7 +274,7 @@ public abstract partial class InventorySystem
}
var attemptEvent = new IsEquippingAttemptEvent(actor, target, itemUid, slotDefinition);
RaiseLocalEvent(target, attemptEvent);
RaiseLocalEvent(target, attemptEvent, true);
if (attemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;
@@ -285,7 +285,7 @@ public abstract partial class InventorySystem
{
//reuse the event. this is gucci, right?
attemptEvent.Reason = null;
RaiseLocalEvent(actor, attemptEvent);
RaiseLocalEvent(actor, attemptEvent, true);
if (attemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;
@@ -294,7 +294,7 @@ public abstract partial class InventorySystem
}
var itemAttemptEvent = new BeingEquippedAttemptEvent(actor, target, itemUid, slotDefinition);
RaiseLocalEvent(itemUid, itemAttemptEvent);
RaiseLocalEvent(itemUid, itemAttemptEvent, true);
if (itemAttemptEvent.Cancelled)
{
reason = itemAttemptEvent.Reason ?? reason;
@@ -426,7 +426,7 @@ public abstract partial class InventorySystem
}
var attemptEvent = new IsUnequippingAttemptEvent(actor, target, itemUid, slotDefinition);
RaiseLocalEvent(target, attemptEvent);
RaiseLocalEvent(target, attemptEvent, true);
if (attemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;
@@ -437,7 +437,7 @@ public abstract partial class InventorySystem
{
//reuse the event. this is gucci, right?
attemptEvent.Reason = null;
RaiseLocalEvent(actor, attemptEvent);
RaiseLocalEvent(actor, attemptEvent, true);
if (attemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;
@@ -446,7 +446,7 @@ public abstract partial class InventorySystem
}
var itemAttemptEvent = new BeingUnequippedAttemptEvent(actor, target, itemUid, slotDefinition);
RaiseLocalEvent(itemUid, itemAttemptEvent);
RaiseLocalEvent(itemUid, itemAttemptEvent, true);
if (itemAttemptEvent.Cancelled)
{
reason = attemptEvent.Reason ?? reason;

2
Content.Shared/MobState/Components/MobStateComponent.cs
View File

@@ -305,7 +305,7 @@ namespace Content.Shared.MobState.Components
state.UpdateState(Owner, threshold, entMan);
var message = new MobStateChangedEvent(this, old, state);
entMan.EventBus.RaiseLocalEvent(Owner, message);
entMan.EventBus.RaiseLocalEvent(Owner, message, true);
Dirty();
}
}

4
Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs
View File

@@ -48,7 +48,7 @@ namespace Content.Shared.Movement.EntitySystems
if (owner != null && session != null)
{
EntityManager.EventBus.RaiseLocalEvent(owner.Value, new RelayMoveInputEvent(session));
EntityManager.EventBus.RaiseLocalEvent(owner.Value, new RelayMoveInputEvent(session), true);
// For stuff like "Moving out of locker" or the likes
if (owner.Value.IsInContainer() &&
@@ -56,7 +56,7 @@ namespace Content.Shared.Movement.EntitySystems
mobState.IsAlive()))
{
var relayMoveEvent = new RelayMovementEntityEvent(owner.Value);
EntityManager.EventBus.RaiseLocalEvent(EntityManager.GetComponent<TransformComponent>(owner.Value).ParentUid, relayMoveEvent);
EntityManager.EventBus.RaiseLocalEvent(EntityManager.GetComponent<TransformComponent>(owner.Value).ParentUid, relayMoveEvent, true);
}
// Pass the rider's inputs to the vehicle (the rider itself is on the ignored list in C.S/MoverController.cs)
if (TryComp<RiderComponent>(owner.Value, out var rider) && rider.Vehicle != null && rider.Vehicle.HasKey)

8
Content.Shared/Pulling/Systems/SharedPullingStateManagementSystem.cs
View File

@@ -61,7 +61,7 @@ namespace Content.Shared.Pulling
RaiseLocalEvent(puller.Owner, message, broadcast: false);
if (Initialized(pullable.Owner))
RaiseLocalEvent(pullable.Owner, message);
RaiseLocalEvent(pullable.Owner, message, true);
// Networking
puller.Dirty();
@@ -117,7 +117,7 @@ namespace Content.Shared.Pulling
var message = new PullStartedMessage(pullerPhysics, pullablePhysics);
RaiseLocalEvent(puller.Owner, message, broadcast: false);
RaiseLocalEvent(pullable.Owner, message);
RaiseLocalEvent(pullable.Owner, message, true);
// Networking
Dirty(puller);
@@ -157,11 +157,11 @@ namespace Content.Shared.Pulling
if (movingTo == null)
{
RaiseLocalEvent(pullable.Owner, new PullableStopMovingMessage());
RaiseLocalEvent(pullable.Owner, new PullableStopMovingMessage(), true);
}
else
{
RaiseLocalEvent(pullable.Owner, new PullableMoveMessage());
RaiseLocalEvent(pullable.Owner, new PullableMoveMessage(), true);
}
}
}

8
Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
View File

@@ -63,9 +63,9 @@ namespace Content.Shared.Pulling
}
var getPulled = new BeingPulledAttemptEvent(puller, pulled);
RaiseLocalEvent(pulled, getPulled);
RaiseLocalEvent(pulled, getPulled, true);
var startPull = new StartPullAttemptEvent(puller, pulled);
RaiseLocalEvent(puller, startPull);
RaiseLocalEvent(puller, startPull, true);
return (!startPull.Cancelled && !getPulled.Cancelled);
}
@@ -88,7 +88,7 @@ namespace Content.Shared.Pulling
}
var msg = new StopPullingEvent(user);
RaiseLocalEvent(pullable.Owner, msg);
RaiseLocalEvent(pullable.Owner, msg, true);
if (msg.Cancelled) return false;
@@ -183,7 +183,7 @@ namespace Content.Shared.Pulling
return false;
}
RaiseLocalEvent(pullable.Owner, pullAttempt);
RaiseLocalEvent(pullable.Owner, pullAttempt, true);
if (pullAttempt.Cancelled)
return false;

4
Content.Shared/StepTrigger/StepTriggerSystem.cs
View File

@@ -77,7 +77,7 @@ public sealed class StepTriggerSystem : EntitySystem
return false;
var ev = new StepTriggeredEvent { Source = component.Owner, Tripper = otherUid };
RaiseLocalEvent(component.Owner, ref ev);
RaiseLocalEvent(component.Owner, ref ev, true);
component.CurrentlySteppedOn.Add(otherUid);
Dirty(component);
@@ -91,7 +91,7 @@ public sealed class StepTriggerSystem : EntitySystem
var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid };
RaiseLocalEvent(uid, ref msg);
RaiseLocalEvent(uid, ref msg, true);
return msg.Continue;
}

6
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -111,7 +111,7 @@ namespace Content.Shared.Throwing
}
}
EntityManager.EventBus.RaiseLocalEvent(uid, new StopThrowEvent {User = thrownItemComponent.Thrower});
EntityManager.EventBus.RaiseLocalEvent(uid, new StopThrowEvent {User = thrownItemComponent.Thrower}, true);
EntityManager.RemoveComponent<ThrownItemComponent>(uid);
}
@@ -146,8 +146,8 @@ namespace Content.Shared.Throwing
_adminLogger.Add(LogType.ThrowHit, LogImpact.Low,
$"{ToPrettyString(thrown.Owner):thrown} thrown by {ToPrettyString(user.Value):thrower} hit {ToPrettyString(target.Owner):target}.");
// TODO: Just pass in the bodies directly
RaiseLocalEvent(target.Owner, new ThrowHitByEvent(user, thrown.Owner, target.Owner));
RaiseLocalEvent(thrown.Owner, new ThrowDoHitEvent(user, thrown.Owner, target.Owner));
RaiseLocalEvent(target.Owner, new ThrowHitByEvent(user, thrown.Owner, target.Owner), true);
RaiseLocalEvent(thrown.Owner, new ThrowDoHitEvent(user, thrown.Owner, target.Owner), true);
}
}
}

14
Content.Shared/Verbs/SharedVerbSystem.cs
View File

@@ -89,7 +89,7 @@ namespace Content.Shared.Verbs
if (types.Contains(typeof(InteractionVerb)))
{
var verbEvent = new GetVerbsEvent<InteractionVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(target, verbEvent);
RaiseLocalEvent(target, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}
@@ -98,35 +98,35 @@ namespace Content.Shared.Verbs
&& @using != target)
{
var verbEvent = new GetVerbsEvent<UtilityVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(@using.Value, verbEvent); // directed at used, not at target
RaiseLocalEvent(@using.Value, verbEvent, true); // directed at used, not at target
verbs.UnionWith(verbEvent.Verbs);
}
if (types.Contains(typeof(InnateVerb)))
{
var verbEvent = new GetVerbsEvent<InnateVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(user, verbEvent);
RaiseLocalEvent(user, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}
if (types.Contains(typeof(AlternativeVerb)))
{
var verbEvent = new GetVerbsEvent<AlternativeVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(target, verbEvent);
RaiseLocalEvent(target, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}
if (types.Contains(typeof(ActivationVerb)))
{
var verbEvent = new GetVerbsEvent<ActivationVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(target, verbEvent);
RaiseLocalEvent(target, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}
if (types.Contains(typeof(ExamineVerb)))
{
var verbEvent = new GetVerbsEvent<ExamineVerb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(target, verbEvent);
RaiseLocalEvent(target, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}
@@ -134,7 +134,7 @@ namespace Content.Shared.Verbs
if (types.Contains(typeof(Verb)))
{
var verbEvent = new GetVerbsEvent<Verb>(user, target, @using, hands, canInteract, canAccess);
RaiseLocalEvent(target, verbEvent);
RaiseLocalEvent(target, verbEvent, true);
verbs.UnionWith(verbEvent.Verbs);
}