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

Merge remote-tracking branch 'Zumorica/2021-12-03-remove-IEntity-komm-süsser-todd' into 2021-12-03-remove-IEntity-komm-süsser-todd

Browse Source 
# Conflicts:
#	Content.Server/DeviceNetwork/Systems/WiredNetworkSystem.cs
#	Content.Server/Hands/Systems/HandsSystem.cs
#	Content.Server/Radio/Components/IRadio.cs
#	Content.Server/UserInterface/ActivatableUISystem.cs
This commit is contained in:
DrSmugleaf
2021-12-05 22:10:07 +01:00
parent ab9d0cc6d8 75247b7e2b
commit 2b1fecbe02
25 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -114,7 +114,7 @@ namespace Content.Server.Hands.Systems
{
var player = session?.AttachedEntity;
if (player == default)
if (!player.HasValue || !player.Value.IsValid())
return false;
if (!EntityManager.TryGetComponent(player.Value, out SharedHandsComponent? hands))
@@ -189,10 +189,12 @@ namespace Content.Server.Hands.Systems
if (session is not IPlayerSession playerSession)
return false;
if (playerSession.AttachedEntity is not {Valid: true} playerEnt || !EntityManager.EntityExists(playerEnt))
var player = playerSession.AttachedEntity;
if (!player.HasValue || !player.Value.IsValid())
return false;
return EntityManager.TryGetComponent(playerEnt, out hands);
return EntityManager.TryGetComponent(player.Value, out hands);
}
private void HandleActivateItem(ICommonSession? session)
@@ -216,12 +218,15 @@ namespace Content.Server.Hands.Systems
if (session is not IPlayerSession playerSession)
return false;
if (playerSession.AttachedEntity is not {Valid: true} playerEnt ||
!EntityManager.EntityExists(playerEnt) ||
playerEnt.IsInContainer() ||
!EntityManager.TryGetComponent(playerEnt, out SharedHandsComponent? hands) ||
var maybePlayer = playerSession.AttachedEntity;
if (!maybePlayer.HasValue) return false;
var player = maybePlayer.Value;
if (!EntityManager.EntityExists(player) ||
player.IsInContainer() ||
!EntityManager.TryGetComponent(player, out SharedHandsComponent? hands) ||
!hands.TryGetActiveHeldEntity(out var throwEnt) ||
!_actionBlockerSystem.CanThrow(playerEnt))
!_actionBlockerSystem.CanThrow(player))
return false;
if (EntityManager.TryGetComponent(throwEnt, out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually)
@@ -271,7 +276,7 @@ namespace Content.Server.Hands.Systems
return;
if (!inventory.TryGetSlotItem(equipmentSlot, out ItemComponent? equipmentItem) ||
!EntityManager.TryGetComponent(equipmentItem.Owner, out ServerStorageComponent? storageComponent))
!EntityManager.TryGetComponent(equipmentItem.OwnerUid, out ServerStorageComponent? storageComponent))
{
plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot", ("slotName", SlotNames[equipmentSlot].ToLower())));
return;