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 despawn, change foreach to for

Browse source
This commit is contained in:
SilicaAndPina 2021-02-05 14:28:27 +13:00
parent 11256e800c
commit e58b1abd6b
2 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,16 +19,15 @@ namespace HISP.Game.Items
public int DespawnTimer; public int DespawnTimer;
public ItemInstance Instance; public ItemInstance Instance;
} }
private static int epoch = 0;
private static List<DroppedItem> droppedItemsList = new List<DroppedItem>(); private static List<DroppedItem> droppedItemsList = new List<DroppedItem>();
public static int GetCountOfItem(Item.ItemInformation item) public static int GetCountOfItem(Item.ItemInformation item)
{ {
DroppedItem[] droppedItems = droppedItemsList.ToArray(); DroppedItem[] droppedItems = droppedItemsList.ToArray();
int count = 0; int count = 0;
foreach(DroppedItem droppedItem in droppedItems) for(int i = 0; i < droppedItems.Length; i++)
{ {
if(droppedItem.Instance.ItemId == item.Id) if(droppedItems[i].Instance.ItemId == item.Id)
{ {
count++; count++;
} }
@ -41,11 +40,11 @@ namespace HISP.Game.Items
DroppedItem[] droppedItems = droppedItemsList.ToArray(); DroppedItem[] droppedItems = droppedItemsList.ToArray();
List<DroppedItem> items = new List<DroppedItem>(); List<DroppedItem> items = new List<DroppedItem>();
foreach(DroppedItem droppedItem in droppedItems) for(int i = 0; i < droppedItems.Length; i++)
{ {
if(droppedItem.X == x && droppedItem.Y == y) if(droppedItems[i].X == x && droppedItems[i].Y == y)
{ {
items.Add(droppedItem); items.Add(droppedItems[i]);
} }
} }
return items.ToArray(); return items.ToArray();
@ -58,10 +57,7 @@ namespace HISP.Game.Items
} }
public static void Update() public static void Update()
{ {
int epoch_new = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; DespawnItems();
DespawnItems(epoch, epoch_new);
GenerateItems(); GenerateItems();
} }
public static void RemoveDroppedItem(DroppedItem item) public static void RemoveDroppedItem(DroppedItem item)
@ -90,35 +86,30 @@ namespace HISP.Game.Items
DroppedItem[] droppedItems = droppedItemsList.ToArray(); DroppedItem[] droppedItems = droppedItemsList.ToArray();
foreach (DroppedItem item in droppedItems) for(int i = 0; i < droppedItems.Length; i++)
{ {
if(item.Instance.RandomId == randomId) if(droppedItems[i].Instance.RandomId == randomId)
{ {
return item; return droppedItems[i];
} }
} }
throw new KeyNotFoundException("Random id: " + randomId.ToString() + " not found"); throw new KeyNotFoundException("Random id: " + randomId.ToString() + " not found");
} }
public static void DespawnItems(int old_epoch, int new_epoch) public static void DespawnItems()
{ {
int removedCount = 0; Database.DecrementDroppedItemDespawnTimer();
DroppedItem[] items = droppedItemsList.ToArray();
foreach (DroppedItem item in items) for(int i = 0; i < droppedItemsList.Count; i++)
{ {
if(new_epoch + item.DespawnTimer < old_epoch) droppedItemsList[i].DespawnTimer--;
if(droppedItemsList[i].DespawnTimer <= 0)
{ {
if(GameServer.GetUsersAt(item.X, item.Y,true,true).Length == 0) Logger.DebugPrint("Despawned Item at " + droppedItemsList[i].X + ", " + droppedItemsList[i].Y);
{ RemoveDroppedItem(droppedItemsList[i]);
Logger.DebugPrint("Despawned Item at " + item.X + ", " + item.Y);
RemoveDroppedItem(item);
removedCount++;
}
} }
} }
if(removedCount > 0)
epoch = new_epoch;
} }
public static void AddItem(ItemInstance item, int x, int y, int despawnTimer=1500) public static void AddItem(ItemInstance item, int x, int y, int despawnTimer=1500)

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

@ -2691,6 +2691,20 @@ namespace HISP.Server
} }
return itemList.ToArray(); return itemList.ToArray();
} }
public static void DecrementDroppedItemDespawnTimer()
{
using (MySqlConnection db = new MySqlConnection(ConnectionString))
{
db.Open();
MySqlCommand sqlCommand = db.CreateCommand();
sqlCommand.CommandText = "UPDATE DroppedItems SET DespawnTimer=DespawnTimer-1";
sqlCommand.ExecuteNonQuery();
sqlCommand.Dispose();
}
}
public static void AddDroppedItem(DroppedItems.DroppedItem item) public static void AddDroppedItem(DroppedItems.DroppedItem item)
{ {