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

Merge pull request #1660 from juliangiebel/bug/anchoring-reagent-dispenser

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-08-17 17:54:21 +02:00
committed by GitHub
parent f54ba4b6d5 2c853ea572
commit 39f13c1849
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/AnchorableComponent.cs
View File

@@ -14,6 +14,8 @@ namespace Content.Server.GameObjects.Components
{ {
public override string Name => "Anchorable"; public override string Name => "Anchorable";
int IInteractUsing.Priority => 1;
/// <summary> /// <summary>
/// Checks if a tool can change the anchored status. /// Checks if a tool can change the anchored status.
/// </summary> /// </summary>

4
Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.GUI;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -12,6 +12,8 @@ namespace Content.Server.GameObjects.Components
private bool _isPlaceable; private bool _isPlaceable;
public bool IsPlaceable { get => _isPlaceable; set => _isPlaceable = value; } public bool IsPlaceable { get => _isPlaceable; set => _isPlaceable = value; }
int IInteractUsing.Priority => 1;
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);

2
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -447,7 +447,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
return; return;
} }
var attackBys = attacked.GetAllComponents<IInteractUsing>().ToList(); var attackBys = attacked.GetAllComponents<IInteractUsing>().OrderByDescending(x => x.Priority);
var attackByEventArgs = new InteractUsingEventArgs var attackByEventArgs = new InteractUsingEventArgs
{ {
User = user, ClickLocation = clickLocation, Using = weapon, Target = attacked User = user, ClickLocation = clickLocation, Using = weapon, Target = attacked

7
Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -12,6 +13,12 @@ namespace Content.Shared.Interfaces.GameObjects.Components
/// </summary> /// </summary>
public interface IInteractUsing public interface IInteractUsing
{ {
/// <summary>
/// The interaction priority. Higher numbers get called first.
/// </summary>
/// <value>Priority defaults to 0</value>
int Priority => 0;
/// <summary> /// <summary>
/// Called when using one object on another when user is in range of the target entity. /// Called when using one object on another when user is in range of the target entity.
/// </summary> /// </summary>