IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-21 20:25:51 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup dropped items code.

Browse source
This commit is contained in:
SilicaAndPina 2021-02-05 13:21:33 +13:00
parent 92c35eb4b9
commit 92aa2dd51a
4 changed files with 39 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Horse Isle Server/HorseIsleServer/Server/Database.cs
View file

@ -2679,12 +2679,11 @@ namespace HISP.Server
MySqlDataReader reader = sqlCommand.ExecuteReader();
while(reader.Read())
{
DroppedItems.DroppedItem droppedItem = new DroppedItems.DroppedItem();
ItemInstance instance = new ItemInstance(reader.GetInt32(3), reader.GetInt32(2));
DroppedItems.DroppedItem droppedItem = new DroppedItems.DroppedItem(instance);
droppedItem.X = reader.GetInt32(0);
droppedItem.Y = reader.GetInt32(1);
droppedItem.DespawnTimer = reader.GetInt32(4);
ItemInstance instance = new ItemInstance(reader.GetInt32(3),reader.GetInt32(2));
droppedItem.instance = instance;
itemList.Add(droppedItem);
}
sqlCommand.Dispose();
@ -2704,8 +2703,8 @@ namespace HISP.Server
sqlCommand.CommandText = "INSERT INTO DroppedItems VALUES(@x, @y, @randomId, @itemId, @despawnTimer)";
sqlCommand.Parameters.AddWithValue("@x", item.X);
sqlCommand.Parameters.AddWithValue("@y", item.Y);
sqlCommand.Parameters.AddWithValue("@randomId", item.instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", item.instance.ItemId);
sqlCommand.Parameters.AddWithValue("@randomId", item.Instance.RandomId);
sqlCommand.Parameters.AddWithValue("@itemId", item.Instance.ItemId);
sqlCommand.Parameters.AddWithValue("@despawnTimer", item.DespawnTimer);
sqlCommand.Prepare();
sqlCommand.ExecuteNonQuery();

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

@ -2937,7 +2937,7 @@ namespace HISP.Server
{
foreach (DroppedItems.DroppedItem item in droppedItems)
{
sender.LoggedinUser.Inventory.Add(item.instance);
sender.LoggedinUser.Inventory.Add(item.Instance);
DroppedItems.RemoveDroppedItem(item);
}
}
@ -2973,7 +2973,7 @@ namespace HISP.Server
DroppedItems.DroppedItem item = DroppedItems.GetDroppedItemById(randomId);
try
{
sender.LoggedinUser.Inventory.Add(item.instance);
sender.LoggedinUser.Inventory.Add(item.Instance);
}
catch (InventoryException)
{
@ -3683,7 +3683,7 @@ namespace HISP.Server
if (sender.LoggedinUser.Inventory.HasItem(value))
itemId = sender.LoggedinUser.Inventory.GetItemByRandomid(value).ItemId;
else if (DroppedItems.IsDroppedItemExist(value))
itemId = DroppedItems.GetDroppedItemById(value).instance.ItemId;
itemId = DroppedItems.GetDroppedItemById(value).Instance.ItemId;
if (itemId == -1)
{
Logger.HackerPrint(sender.LoggedinUser.Username + " asked for details of non existiant item.");