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

Fix crashing

Browse source
This commit is contained in:
SilicaAndPina 2020-12-19 16:59:34 +13:00
parent 18201596c8
commit e407a706b5
3 changed files with 1523 additions and 1520 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3032
DataCollection/gamedata.json
View file

File diff suppressed because it is too large Load diff

9
Horse Isle Server/Horse Isle Server/Server/GameClient.cs
View file

@ -41,10 +41,13 @@ namespace HISP.Server
private void warnTimerTick(object state) private void warnTimerTick(object state)
{ {
warnTimer.Change(0, 0);
Logger.DebugPrint("Sending inactivity warning to: " + RemoteIp); Logger.DebugPrint("Sending inactivity warning to: " + RemoteIp);
byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatIdleWarningMessage(), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] chatPacket = PacketBuilder.CreateChat(Messages.FormatIdleWarningMessage(), PacketBuilder.CHAT_BOTTOM_RIGHT);
SendPacket(chatPacket); SendPacket(chatPacket);
warnTimer.Dispose();
warnTimer = null;
} }
private void kickTimerTick(object state) private void kickTimerTick(object state)
@ -131,10 +134,10 @@ namespace HISP.Server
if (kickTimer != null && identifier != PacketBuilder.PACKET_KEEP_ALIVE) if (kickTimer != null && identifier != PacketBuilder.PACKET_KEEP_ALIVE)
kickTimer.Change(kickInterval, kickInterval); kickTimer = new Timer(new TimerCallback(kickTimerTick), null, kickInterval, kickInterval);
if (warnTimer != null && identifier != PacketBuilder.PACKET_KEEP_ALIVE) if (warnTimer != null && identifier != PacketBuilder.PACKET_KEEP_ALIVE)
warnTimer.Change(warnInterval, warnInterval); warnTimer = new Timer(new TimerCallback(warnTimerTick), null, warnInterval, warnInterval);
if (!LoggedIn) // Must be either login or policy-file-request if (!LoggedIn) // Must be either login or policy-file-request
{ {

2
Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs
View file

@ -200,7 +200,7 @@ namespace HISP.Server
item.Effects = effectsList; item.Effects = effectsList;
item.SpawnParamaters = new Item.SpawnRules(); item.SpawnParamaters = new Item.SpawnRules();
item.SpawnParamaters.SpawnCap = gameData.item.item_list[i].spawn_parameters.spawn_cap; item.SpawnParamaters.SpawnCap = gameData.item.item_list[i].spawn_parameters.spawn_cap;
item.SpawnParamaters.SpawnInZone = gameData.item.item_list[i].spawn_parameters.spawn_in_area; item.SpawnParamaters.SpawnInZone = gameData.item.item_list[i].spawn_parameters.spawn_in_zone;
item.SpawnParamaters.SpawnOnTileType = gameData.item.item_list[i].spawn_parameters.spawn_on_tile_type; item.SpawnParamaters.SpawnOnTileType = gameData.item.item_list[i].spawn_parameters.spawn_on_tile_type;
item.SpawnParamaters.SpawnOnSpecialTile = gameData.item.item_list[i].spawn_parameters.spawn_on_special_tile; item.SpawnParamaters.SpawnOnSpecialTile = gameData.item.item_list[i].spawn_parameters.spawn_on_special_tile;
item.SpawnParamaters.SpawnNearSpecialTile = gameData.item.item_list[i].spawn_parameters.spawn_near_special_tile; item.SpawnParamaters.SpawnNearSpecialTile = gameData.item.item_list[i].spawn_parameters.spawn_near_special_tile;