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

fix crashes

Browse source
This commit is contained in:
Bluzume 2021-11-08 14:42:05 -05:00
parent b4350d1e5f
commit 0b6359f1dd
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs
View file

@ -51,7 +51,7 @@ namespace HISP.Game.Chat
client.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.GameUpdates).Count++; client.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.GameUpdates).Count++;
} }
client.Kick("Server was closed by an Administrator."); client.Kick("%SHUTDOWN Command Executed by an Administrator (Probably a server restart)");
} }
} }
@ -60,6 +60,8 @@ namespace HISP.Game.Chat
byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message.Substring(1)), PacketBuilder.CHAT_BOTTOM_LEFT); byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatAdminCommandCompleteMessage(message.Substring(1)), PacketBuilder.CHAT_BOTTOM_LEFT);
user.LoggedinClient.SendPacket(chatPacket); user.LoggedinClient.SendPacket(chatPacket);
Program.ShuttingDown = true; Program.ShuttingDown = true;
Thread.Sleep(1000); // give it a few seconds to shut down, if it doesnt force exit
Environment.Exit(0);
return true; return true;
} }
public static bool Give(string message, string[] args, User user) public static bool Give(string message, string[] args, User user)

2
HorseIsleServer/HorseIsleServer/Player/Trade.cs
View file

@ -218,7 +218,7 @@ namespace HISP.Player
foreach (ItemInstance itm in item) foreach (ItemInstance itm in item)
{ {
Trader.Inventory.Remove(itm); Trader.Inventory.Remove(itm);
OtherTrade.Trader.Inventory.Add(itm); OtherTrade.Trader.Inventory.AddIgnoringFull(itm);
} }
} }

3
HorseIsleServer/HorseIsleServer/Server/GameClient.cs
View file

@ -181,7 +181,8 @@ namespace HISP.Server
Logger.DebugPrint("Sending keep-alive packet to " + LoggedinUser.Username); Logger.DebugPrint("Sending keep-alive packet to " + LoggedinUser.Username);
byte[] updatePacket = PacketBuilder.CreateKeepAlive(); byte[] updatePacket = PacketBuilder.CreateKeepAlive();
SendPacket(updatePacket); SendPacket(updatePacket);
keepAliveTimer.Change(oneMinute, oneMinute); if(keepAliveTimer != null)
keepAliveTimer.Change(oneMinute, oneMinute);
} }
private void minuteTimerTick(object state) private void minuteTimerTick(object state)
{ {