space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ContainerManagerComponent.ContainsEntity not returning correct results for multiple containers.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-12-24 15:16:14 +01:00
parent 47d4a8f628
commit 2f94beb4b5
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.ClientContainer.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.ViewVariables;
@@ -8,6 +9,7 @@ namespace Robust.Client.GameObjects.Components.Containers
{
public sealed partial class ContainerManagerComponent
{
[DebuggerDisplay("ClientContainer {Owner.Uid}/{ID}")]
private sealed class ClientContainer : IContainer
{
public List<IEntity> Entities { get; } = new List<IEntity>();

5
Robust.Client/GameObjects/Components/Containers/ContainerManagerComponent.cs
View File

@@ -45,7 +45,10 @@ namespace Robust.Client.GameObjects.Components.Containers
{
foreach (var container in _containers.Values)
{
return !container.Deleted && container.Contains(entity);
if (!container.Deleted && container.Contains(entity))
{
return true;
}
}
return false;

5
Robust.Server/GameObjects/Components/Container/ContainerManagerComponent.cs
View File

@@ -116,7 +116,10 @@ namespace Robust.Server.GameObjects.Components.Container
{
foreach (var container in EntityContainers.Values)
{
return !container.Deleted && container.Contains(entity);
if (!container.Deleted && container.Contains(entity))
{
return true;
}
}
return false;