IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +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>

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

@ -1347,71 +1347,75 @@ namespace HISP.Server
if (World.InSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y))
{
World.SpecialTile tile = World.GetSpecialTile(sender.LoggedinUser.X, sender.LoggedinUser.Y);
if (tile.Code.StartsWith("TRAINER-"))
if (tile.Code != null)
{
if(trainHorseInst.TrainTimer > 0)
if (tile.Code.StartsWith("TRAINER-"))
{
byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainerCantTrainAgainIn(trainHorseInst.TrainTimer), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(trainSuccessfulMessage);
break;
}
string[] trainerInfo = tile.Code.Split('-');
int trainerId = int.Parse(trainerInfo[1]);
Trainer trainer = Trainer.GetTrainerById(trainerId);
if(sender.LoggedinUser.Money >= trainer.MoneyCost)
{
sender.LoggedinUser.TakeMoney(trainer.MoneyCost);
trainHorseInst.BasicStats.Mood -= trainer.MoodCost;
trainHorseInst.BasicStats.Thirst -= trainer.ThirstCost;
trainHorseInst.BasicStats.Hunger -= trainer.HungerCost;
switch (trainer.ImprovesStat.ToUpper())
if (trainHorseInst.TrainTimer > 0)
{
case "SPEED":
trainHorseInst.AdvancedStats.Speed += trainer.ImprovesAmount;
break;
case "STRENGTH":
trainHorseInst.AdvancedStats.Strength += trainer.ImprovesAmount;
break;
case "AGILITY":
trainHorseInst.AdvancedStats.Agility += trainer.ImprovesAmount;
break;
case "ENDURANCE":
trainHorseInst.AdvancedStats.Endurance += trainer.ImprovesAmount;
break;
case "CONFORMATION":
trainHorseInst.AdvancedStats.Conformation += trainer.ImprovesAmount;
break;
default:
trainHorseInst.AdvancedStats.Speed += trainer.ImprovesAmount;
break;
byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainerCantTrainAgainIn(trainHorseInst.TrainTimer), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(trainSuccessfulMessage);
break;
}
string[] trainerInfo = tile.Code.Split('-');
int trainerId = int.Parse(trainerInfo[1]);
Trainer trainer = Trainer.GetTrainerById(trainerId);
if (sender.LoggedinUser.Money >= trainer.MoneyCost)
{
sender.LoggedinUser.TakeMoney(trainer.MoneyCost);
trainHorseInst.BasicStats.Mood -= trainer.MoodCost;
trainHorseInst.BasicStats.Thirst -= trainer.ThirstCost;
trainHorseInst.BasicStats.Hunger -= trainer.HungerCost;
switch (trainer.ImprovesStat.ToUpper())
{
case "SPEED":
trainHorseInst.AdvancedStats.Speed += trainer.ImprovesAmount;
break;
case "STRENGTH":
trainHorseInst.AdvancedStats.Strength += trainer.ImprovesAmount;
break;
case "AGILITY":
trainHorseInst.AdvancedStats.Agility += trainer.ImprovesAmount;
break;
case "ENDURANCE":
trainHorseInst.AdvancedStats.Endurance += trainer.ImprovesAmount;
break;
case "CONFORMATION":
trainHorseInst.AdvancedStats.Conformation += trainer.ImprovesAmount;
break;
default:
trainHorseInst.AdvancedStats.Speed += trainer.ImprovesAmount;
break;
}
trainHorseInst.BasicStats.Experience += trainer.ExperienceGained;
if (sender.LoggedinUser.Subscribed)
trainHorseInst.TrainTimer = 1440;
else
trainHorseInst.TrainTimer = 720;
byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainedInStatFormat(trainHorseInst.Name, trainer.ImprovesStat), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(trainSuccessfulMessage);
sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count++;
if (sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count >= 1000)
sender.LoggedinUser.Awards.AddAward(Award.GetAwardById(26)); // Pro Trainer
if (sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count >= 10000)
sender.LoggedinUser.Awards.AddAward(Award.GetAwardById(53)); // Top Trainer
UpdateArea(sender);
}
trainHorseInst.BasicStats.Experience += trainer.ExperienceGained;
if(sender.LoggedinUser.Subscribed)
trainHorseInst.TrainTimer = 1440;
else
trainHorseInst.TrainTimer = 720;
{
byte[] cantAffordPacket = PacketBuilder.CreateChat(Messages.TrainerCantAfford, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantAffordPacket);
}
byte[] trainSuccessfulMessage = PacketBuilder.CreateChat(Messages.FormatTrainedInStatFormat(trainHorseInst.Name, trainer.ImprovesStat), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(trainSuccessfulMessage);
sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count++;
if (sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count >= 1000)
sender.LoggedinUser.Awards.AddAward(Award.GetAwardById(26)); // Pro Trainer
if (sender.LoggedinUser.TrackedItems.GetTrackedItem(Tracking.TrackableItem.Training).Count >= 10000)
sender.LoggedinUser.Awards.AddAward(Award.GetAwardById(53)); // Top Trainer
UpdateArea(sender);
}
else
{
byte[] cantAffordPacket = PacketBuilder.CreateChat(Messages.TrainerCantAfford, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantAffordPacket);
}
}