Joonas Rikkonen
bf87006bc3
The clients delay applying the received remote state of an inventory they just put an item inside, because otherwise the inventory may revert to an old state if items are moved in rapid succession. I think the problem was that the delay was not applied to the inventory the item is _taken from_, so it was possible that the clients applied an old delayed state even though an item had just been moved out of the inventory. Another problem was that the server didn't create an event for the inventory the item was removed from, so if there were any wrong items in a client-side inventory, they would just be dropped instead of being moved back to the correct inventory.
117 lines
3.6 KiB
C#
117 lines
3.6 KiB
C#
using Barotrauma.Items.Components;
|
|
using Barotrauma.Networking;
|
|
using Microsoft.Xna.Framework;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Barotrauma
|
|
{
|
|
class ItemInventory : Inventory
|
|
{
|
|
ItemContainer container;
|
|
|
|
public ItemInventory(Item owner, ItemContainer container, int capacity, Vector2? centerPos = null, int slotsPerRow = 5)
|
|
: base(owner, capacity, centerPos, slotsPerRow)
|
|
{
|
|
this.container = container;
|
|
}
|
|
|
|
public override int FindAllowedSlot(Item item)
|
|
{
|
|
if (ItemOwnsSelf(item)) return -1;
|
|
|
|
for (int i = 0; i < capacity; i++)
|
|
{
|
|
//item is already in the inventory!
|
|
if (Items[i] == item) return -1;
|
|
}
|
|
|
|
if (!container.CanBeContained(item)) return -1;
|
|
|
|
for (int i = 0; i < capacity; i++)
|
|
{
|
|
if (Items[i] == null) return i;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
public override bool CanBePut(Item item, int i)
|
|
{
|
|
if (ItemOwnsSelf(item)) return false;
|
|
if (i < 0 || i >= Items.Length) return false;
|
|
return (item!=null && Items[i]==null && container.CanBeContained(item));
|
|
}
|
|
|
|
|
|
public override bool TryPutItem(Item item, Character user, List<InvSlotType> allowedSlots = null, bool createNetworkEvent = true)
|
|
{
|
|
bool wasPut = base.TryPutItem(item, user, allowedSlots, createNetworkEvent);
|
|
|
|
if (wasPut)
|
|
{
|
|
foreach (Character c in Character.CharacterList)
|
|
{
|
|
if (!c.HasSelectedItem(item)) continue;
|
|
|
|
item.Unequip(c);
|
|
break;
|
|
}
|
|
|
|
container.IsActive = true;
|
|
container.OnItemContained(item);
|
|
}
|
|
|
|
return wasPut;
|
|
}
|
|
|
|
public override bool TryPutItem(Item item, int i, bool allowSwapping, bool allowCombine, Character user, bool createNetworkEvent = true)
|
|
{
|
|
bool wasPut = base.TryPutItem(item, i, allowSwapping, allowCombine, user, createNetworkEvent);
|
|
|
|
if (wasPut)
|
|
{
|
|
foreach (Character c in Character.CharacterList)
|
|
{
|
|
if (!c.HasSelectedItem(item)) continue;
|
|
|
|
item.Unequip(c);
|
|
break;
|
|
}
|
|
|
|
container.IsActive = true;
|
|
container.OnItemContained(item);
|
|
}
|
|
|
|
return wasPut;
|
|
}
|
|
|
|
protected override void CreateNetworkEvent()
|
|
{
|
|
int componentIndex = container.Item.components.IndexOf(container);
|
|
if (componentIndex == -1)
|
|
{
|
|
DebugConsole.Log("Creating a network event for the item \"" + container.Item + "\" failed, ItemContainer not found in components");
|
|
return;
|
|
}
|
|
|
|
if (GameMain.Server != null)
|
|
{
|
|
GameMain.Server.CreateEntityEvent(Owner as IServerSerializable, new object[] { NetEntityEvent.Type.InventoryState, componentIndex });
|
|
}
|
|
#if CLIENT
|
|
else if (GameMain.Client != null)
|
|
{
|
|
syncItemsDelay = 1.0f;
|
|
GameMain.Client.CreateEntityEvent(Owner as IClientSerializable, new object[] { NetEntityEvent.Type.InventoryState, componentIndex });
|
|
}
|
|
#endif
|
|
}
|
|
|
|
public override void RemoveItem(Item item)
|
|
{
|
|
base.RemoveItem(item);
|
|
container.OnItemRemoved(item);
|
|
}
|
|
}
|
|
}
|