vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(3dc4135ce) v0.9.5.1

Browse Source
This commit is contained in:
Regalis
2019-11-21 18:22:25 +01:00
parent b39922a074
commit 5c95c53118
287 changed files with 12655 additions and 5048 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Inventory.cs
+3 -3
View File
@@ -993,7 +993,7 @@ namespace Barotrauma
Color.Lerp(Color.Red, Color.Green, item.Condition / item.MaxCondition) * 0.8f, true);
}
if (itemContainer != null)
if (itemContainer != null && itemContainer.ShowContainedStateIndicator)
{
float containedState = 0.0f;
if (itemContainer.ShowConditionInContainedStateIndicator)
@@ -1156,7 +1156,7 @@ namespace Barotrauma
private void ApplyReceivedState()
{
if (receivedItemIDs == null) return;
if (receivedItemIDs == null || (Owner != null && Owner.Removed)) { return; }
for (int i = 0; i < capacity; i++)
{
@@ -1171,7 +1171,7 @@ namespace Barotrauma
{
if (receivedItemIDs[i] > 0)
{
if (!(Entity.FindEntityByID(receivedItemIDs[i]) is Item item) || Items[i] == item) continue;
if (!(Entity.FindEntityByID(receivedItemIDs[i]) is Item item) || Items[i] == item) { continue; }
TryPutItem(item, i, true, true, null, false);
for (int j = 0; j < capacity; j++)