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

fix more possible crashes

Browse source
This commit is contained in:
Bluzume 2021-11-03 23:27:20 -04:00
parent 6cec9249ab
commit e7b24c709f
1 changed files with 320 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
HorseIsleServer/HorseIsleServer/Server/GameServer.cs
View file

@ -899,6 +899,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("VET-")) if (tile.Code.StartsWith("VET-"))
{ {
string[] vetInfo = tile.Code.Split('-'); string[] vetInfo = tile.Code.Split('-');
@ -933,6 +935,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
case PacketBuilder.HORSE_VET_SERVICE: case PacketBuilder.HORSE_VET_SERVICE:
@ -960,6 +964,8 @@ namespace HISP.Server
if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("VET-")) if (tile.Code.StartsWith("VET-"))
{ {
string[] vetInfo = tile.Code.Split('-'); string[] vetInfo = tile.Code.Split('-');
@ -983,6 +989,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
} }
@ -1017,6 +1025,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("FARRIER-")) if (tile.Code.StartsWith("FARRIER-"))
{ {
string[] farrierInfo = tile.Code.Split('-'); string[] farrierInfo = tile.Code.Split('-');
@ -1056,6 +1066,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
} }
@ -1068,6 +1080,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("FARRIER-")) if (tile.Code.StartsWith("FARRIER-"))
{ {
string[] farrierInfo = tile.Code.Split('-'); string[] farrierInfo = tile.Code.Split('-');
@ -1107,6 +1121,8 @@ namespace HISP.Server
UpdateArea(sender); UpdateArea(sender);
} }
} }
}
break; break;
case PacketBuilder.HORSE_GROOM_SERVICE: case PacketBuilder.HORSE_GROOM_SERVICE:
randomId = 0; randomId = 0;
@ -1133,6 +1149,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("GROOMER-")) if (tile.Code.StartsWith("GROOMER-"))
{ {
string[] groomerInfo = tile.Code.Split('-'); string[] groomerInfo = tile.Code.Split('-');
@ -1158,6 +1176,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
} }
@ -1170,6 +1190,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("GROOMER-")) if (tile.Code.StartsWith("GROOMER-"))
{ {
string[] groomerInfo = tile.Code.Split('-'); string[] groomerInfo = tile.Code.Split('-');
@ -1212,6 +1234,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
case PacketBuilder.HORSE_BARN_SERVICE: case PacketBuilder.HORSE_BARN_SERVICE:
@ -1239,6 +1263,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if (tile.Code != null)
{
if (tile.Code.StartsWith("BARN-")) if (tile.Code.StartsWith("BARN-"))
{ {
string[] barnInfo = tile.Code.Split('-'); string[] barnInfo = tile.Code.Split('-');
@ -1266,6 +1292,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
} }
@ -1278,6 +1306,8 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("BARN-")) if (tile.Code.StartsWith("BARN-"))
{ {
string[] barnInfo = tile.Code.Split('-'); string[] barnInfo = tile.Code.Split('-');
@ -1320,6 +1350,8 @@ namespace HISP.Server
} }
UpdateArea(sender); UpdateArea(sender);
} }
}
} }
break; break;
case PacketBuilder.HORSE_TRAIN: case PacketBuilder.HORSE_TRAIN:
@ -1587,6 +1619,8 @@ namespace HISP.Server
if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("ARENA-")) if (tile.Code.StartsWith("ARENA-"))
{ {
string[] arenaInfo = tile.Code.Split('-'); string[] arenaInfo = tile.Code.Split('-');
@ -1650,6 +1684,8 @@ namespace HISP.Server
sender.SendPacket(allreadyEntered); sender.SendPacket(allreadyEntered);
} }
} }
}
} }
} }
else else
@ -2656,6 +2692,8 @@ namespace HISP.Server
if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y)) if(World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{ {
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y); World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if(tile.Code != null)
{
if (tile.Code.StartsWith("PASSWORD-")) if (tile.Code.StartsWith("PASSWORD-"))
{ {
string[] args = tile.Code.Replace("!", "-").Split('-'); string[] args = tile.Code.Replace("!", "-").Split('-');
@ -2688,6 +2726,7 @@ namespace HISP.Server
break; break;
} }
} }
}
else else
{ {
Logger.HackerPrint(sender.LoggedinUser.Username + " Sent a password while not in a special tile."); Logger.HackerPrint(sender.LoggedinUser.Username + " Sent a password while not in a special tile.");
@ -7992,6 +8031,8 @@ namespace HISP.Server
public static bool ProcessMapCodeWithArg(GameClient forClient, World.SpecialTile tile) public static bool ProcessMapCodeWithArg(GameClient forClient, World.SpecialTile tile)
{ {
string mapCode = tile.Code; string mapCode = tile.Code;
if (mapCode == null)
return false;
if(mapCode.Contains('-')) if(mapCode.Contains('-'))
{ {
string[] codeInfo = mapCode.Split('-'); string[] codeInfo = mapCode.Split('-');