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

Make entity storage lookup range positive (#9735)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-15 09:55:36 +12:00
committed by GitHub
parent a49121f681
commit f7d02968a4
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -28,11 +28,11 @@ public sealed class EntityStorageComponent : Component
public int RemovedMasks;
[ViewVariables]
[DataField("Capacity")]
public int StorageCapacityMax = 30;
[DataField("capacity")]
public int Capacity = 30;
[ViewVariables]
[DataField("IsCollidableWhenOpen")]
[DataField("isCollidableWhenOpen")]
public bool IsCollidableWhenOpen;
//The offset for where items are emptied/vacuumed for the EntityStorage.
@@ -44,8 +44,8 @@ public sealed class EntityStorageComponent : Component
public readonly CollisionGroup EnteringOffsetCollisionFlags = CollisionGroup.Impassable | CollisionGroup.MidImpassable;
[ViewVariables]
[DataField("EnteringRange")]
public float EnteringRange = -0.18f;
[DataField("enteringRange")]
public float EnteringRange = 0.18f;
[DataField("showContents")]
public bool ShowContents;

4
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -162,7 +162,7 @@ public sealed class EntityStorageSystem : EntitySystem
continue;
count++;
if (count >= component.StorageCapacityMax)
if (count >= component.Capacity)
break;
}
@@ -202,7 +202,7 @@ public sealed class EntityStorageSystem : EntitySystem
if (component.Open)
return true;
if (component.Contents.ContainedEntities.Count >= component.StorageCapacityMax)
if (component.Contents.ContainedEntities.Count >= component.Capacity)
return false;
return true;