IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-10 07:05:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix "Grabbed what you could but your inventory is full" not showing up

Browse source
This commit is contained in:
SilicaAndPina 2021-02-05 14:37:19 +13:00
parent e58b1abd6b
commit 6ce2c33a42
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Horse Isle Server/HorseIsleServer/Game/Items/DroppedItems.cs
View file

@ -106,6 +106,8 @@ namespace HISP.Game.Items
droppedItemsList[i].DespawnTimer--; droppedItemsList[i].DespawnTimer--;
if(droppedItemsList[i].DespawnTimer <= 0) if(droppedItemsList[i].DespawnTimer <= 0)
{ {
if (GameServer.GetUsersAt(droppedItemsList[i].X, droppedItemsList[i].Y, true, true).Length > 0) // Dont despawn items players are standing on
continue;
Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y); Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y);
RemoveDroppedItem(droppedItemsList[i]); RemoveDroppedItem(droppedItemsList[i]);
} }

13
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -2933,18 +2933,17 @@ namespace HISP.Server
string chatMsg = Messages.GrabAllItemsMessage; string chatMsg = Messages.GrabAllItemsMessage;
DroppedItems.DroppedItem[] droppedItems = DroppedItems.GetItemsAt(sender.LoggedinUser.X, sender.LoggedinUser.Y); DroppedItems.DroppedItem[] droppedItems = DroppedItems.GetItemsAt(sender.LoggedinUser.X, sender.LoggedinUser.Y);
try foreach (DroppedItems.DroppedItem item in droppedItems)
{ {
foreach (DroppedItems.DroppedItem item in droppedItems) try
{ {
sender.LoggedinUser.Inventory.Add(item.Instance); sender.LoggedinUser.Inventory.Add(item.Instance);
DroppedItems.RemoveDroppedItem(item); DroppedItems.RemoveDroppedItem(item);
} }
} catch (InventoryException)
catch (InventoryException) {
{ chatMsg = Messages.GrabbedAllItemsButInventoryFull;
chatMsg = Messages.GrabbedAllItemsButInventoryFull; }
break;
} }
UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y); UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y);