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 crash

Browse source
This commit is contained in:
Bluzume 2021-11-03 23:15:48 -04:00
parent 9272d71ca7
commit 6cec9249ab
2 changed files with 63 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
HorseIsleServer/HorseIsleServer/Resources/GitCommit
View file

@ -1 +0,0 @@
<Replaced with current git HEAD at compile time>

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

@ -1347,9 +1347,11 @@ 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("TRAINER-")) if (tile.Code.StartsWith("TRAINER-"))
{ {
if(trainHorseInst.TrainTimer > 0) if (trainHorseInst.TrainTimer > 0)
{ {
byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainerCantTrainAgainIn(trainHorseInst.TrainTimer), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainerCantTrainAgainIn(trainHorseInst.TrainTimer), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(trainSuccessfulMessage); sender.SendPacket(trainSuccessfulMessage);
@ -1360,7 +1362,7 @@ namespace HISP.Server
Trainer trainer = Trainer.GetTrainerById(trainerId); Trainer trainer = Trainer.GetTrainerById(trainerId);
if(sender.LoggedinUser.Money >= trainer.MoneyCost) if (sender.LoggedinUser.Money >= trainer.MoneyCost)
{ {
sender.LoggedinUser.TakeMoney(trainer.MoneyCost); sender.LoggedinUser.TakeMoney(trainer.MoneyCost);
trainHorseInst.BasicStats.Mood -= trainer.MoodCost; trainHorseInst.BasicStats.Mood -= trainer.MoodCost;
@ -1390,7 +1392,7 @@ namespace HISP.Server
break; break;
} }
trainHorseInst.BasicStats.Experience += trainer.ExperienceGained; trainHorseInst.BasicStats.Experience += trainer.ExperienceGained;
if(sender.LoggedinUser.Subscribed) if (sender.LoggedinUser.Subscribed)
trainHorseInst.TrainTimer = 1440; trainHorseInst.TrainTimer = 1440;
else else
trainHorseInst.TrainTimer = 720; trainHorseInst.TrainTimer = 720;
@ -1415,6 +1417,8 @@ namespace HISP.Server
} }
} }
}
} }
break; break;
} }