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

Update content repo and RobustToolbox

Browse Source
This commit is contained in:
Jackson Lewis
2020-04-20 10:36:02 +01:00
parent bb9ee66db4
commit 6a22f2629b
27 changed files with 187 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
namespace Content.Server.GameObjects.Components.Construction
@@ -30,9 +31,10 @@ namespace Content.Server.GameObjects.Components.Construction
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
switch (message)
{
case TryStartStructureConstructionMessage tryStart:

4
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -85,9 +85,9 @@ namespace Content.Server.GameObjects
ActivateImpl(eventArgs);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

4
Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs
View File

@@ -51,9 +51,9 @@ namespace Content.Server.GameObjects
return flagsCheck;
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

35
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -11,6 +11,7 @@ using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.ViewVariables;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
@@ -304,16 +305,35 @@ namespace Content.Server.GameObjects
}
/// <inheritdoc />
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{
case ContainerContentsModifiedMessage msg:
if (msg.Removed)
ForceUnequip(msg.Container, msg.Entity);
break;
default:
break;
}
}
/// <inheritdoc />
public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, netChannel, session);
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
switch (message)
{
case ClientInventoryMessage msg:
var playerMan = IoCManager.Resolve<IPlayerManager>();
var session = playerMan.GetSessionByChannel(netChannel);
var playerentity = session.AttachedEntity;
if (playerentity == Owner)
@@ -327,11 +347,6 @@ namespace Content.Server.GameObjects
if (item != null && item.Owner.TryGetComponent(out ServerStorageComponent storage))
storage.OpenStorageUI(Owner);
break;
case ContainerContentsModifiedMessage msg:
if (msg.Removed)
ForceUnequip(msg.Container, msg.Entity);
break;
}
}

19
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -17,6 +17,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -448,17 +449,19 @@ namespace Content.Server.GameObjects
return false;
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
switch (message)
{
case ClientChangedHandMsg msg:
{
var playerMan = IoCManager.Resolve<IPlayerManager>();
var session = playerMan.GetSessionByChannel(netChannel);
var playerEntity = session.AttachedEntity;
if (playerEntity == Owner && HasHand(msg.Index))
@@ -475,8 +478,6 @@ namespace Content.Server.GameObjects
return;
}
var playerMan = IoCManager.Resolve<IPlayerManager>();
var session = playerMan.GetSessionByChannel(netChannel);
var playerEntity = session.AttachedEntity;
var used = GetActiveHand?.Owner;
@@ -502,8 +503,6 @@ namespace Content.Server.GameObjects
case UseInHandMsg msg:
{
var playerMan = IoCManager.Resolve<IPlayerManager>();
var session = playerMan.GetSessionByChannel(netChannel);
var playerEntity = session.AttachedEntity;
var used = GetActiveHand?.Owner;
@@ -518,8 +517,6 @@ namespace Content.Server.GameObjects
case ActivateInHandMsg msg:
{
var playerMan = IoCManager.Resolve<IPlayerManager>();
var session = playerMan.GetSessionByChannel(netChannel);
var playerEntity = session.AttachedEntity;
var used = GetHand(msg.Index)?.Owner;

7
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -7,6 +7,7 @@ using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -45,11 +46,11 @@ namespace Content.Server.GameObjects.Components.Instruments
serializer.DataField(ref _handheld, "handheld", false);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
// If the client that sent the message isn't the client playing this instrument, we ignore it.
if (netChannel != _instrumentPlayer) return;
if (channel != _instrumentPlayer) return;
switch (message)
{
case InstrumentMidiEventMessage midiEventMsg:

4
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -272,9 +272,9 @@ namespace Content.Server.GameObjects.Components
}
/// <inheritdoc />
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

25
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage;
@@ -19,6 +20,7 @@ using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
namespace Content.Server.GameObjects
@@ -33,7 +35,6 @@ namespace Content.Server.GameObjects
{
#pragma warning disable 649
[Dependency] private readonly IMapManager _mapManager;
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
@@ -255,18 +256,22 @@ namespace Content.Server.GameObjects
/// and puts the removed entity in hand or on the ground
/// </summary>
/// <param name="message"></param>
/// <param name="netChannel"></param>
/// <param name="component"></param>
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
/// <param name="channel"></param>
/// <param name="session"></param>
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
if (session == null)
{
throw new ArgumentException(nameof(session));
}
switch (message)
{
case RemoveEntityMessage _:
{
_ensureInitialCalculated();
var session = _playerManager.GetSessionByChannel(netChannel);
var playerentity = session.AttachedEntity;
var ourtransform = Owner.GetComponent<ITransformComponent>();
@@ -296,7 +301,7 @@ namespace Content.Server.GameObjects
case InsertEntityMessage _:
{
_ensureInitialCalculated();
var playerEntity = _playerManager.GetSessionByChannel(netChannel).AttachedEntity;
var playerEntity = session.AttachedEntity;
var storageTransform = Owner.GetComponent<ITransformComponent>();
var playerTransform = playerEntity.GetComponent<ITransformComponent>();
// TODO: Replace by proper entity range check once it is implemented.
@@ -311,9 +316,7 @@ namespace Content.Server.GameObjects
}
case CloseStorageUIMessage _:
{
var session = _playerManager.GetSessionByChannel(netChannel);
UnsubscribeSession(session);
UnsubscribeSession(session as IPlayerSession);
break;
}
}

5
Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs
View File

@@ -54,9 +54,10 @@ namespace Content.Server.GameObjects
serializer.DataFieldCached(ref _heatResistance, "HeatResistance", 323);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, component);
switch (message)
{
case PlayerAttachedMsg _:

7
Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
View File

@@ -105,12 +105,9 @@ namespace Content.Server.GameObjects.Components.Movement
}
/// <inheritdoc />
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
if(netChannel != null)
return;
base.HandleMessage(message, component);
switch (message)
{

31
Content.Server/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -7,6 +7,7 @@ using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Players;
using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer;
@@ -38,10 +39,27 @@ namespace Content.Server.GameObjects.Components.Observer
public override ComponentState GetComponentState() => new GhostComponentState(CanReturnToBody);
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{
case PlayerAttachedMsg msg:
msg.NewPlayer.VisibilityMask |= (int)VisibilityFlags.Ghost;
Dirty();
break;
case PlayerDetachedMsg msg:
msg.OldPlayer.VisibilityMask &= ~(int)VisibilityFlags.Ghost;
break;
default:
break;
}
}
public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, netChannel, session);
switch (message)
{
@@ -53,13 +71,6 @@ namespace Content.Server.GameObjects.Components.Observer
Owner.Delete();
}
break;
case PlayerAttachedMsg msg:
msg.NewPlayer.VisibilityMask |= (int)VisibilityFlags.Ghost;
Dirty();
break;
case PlayerDetachedMsg msg:
msg.OldPlayer.VisibilityMask &= ~(int)VisibilityFlags.Ghost;
break;
default:
break;
}

13
Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
View File

@@ -9,6 +9,7 @@ using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Timers;
namespace Content.Server.GameObjects.Components.Weapon.Ranged
@@ -40,16 +41,18 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
FireHandler?.Invoke(user, clickLocation);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
switch (message)
{
case SyncFirePosMessage msg:
var playerMgr = IoCManager.Resolve<IPlayerManager>();
var session = playerMgr.GetSessionByChannel(netChannel);
var user = session.AttachedEntity;
if (user == null)
{