diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs b/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs index cbf3332..9668797 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs @@ -241,7 +241,7 @@ namespace HISP.Game.Chat } else { - User player = findNamePartial(args[2]); + User player = findNamePartial(args[1]); player.LoggedinClient.SendPacket(packetBytes); } } diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs index db991bf..e1b0d47 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs @@ -231,7 +231,8 @@ namespace HISP.Game user.HorseWindowOpen = false; string message = ""; message += buildPlayersHere(user, x, y); - message += buildNearbyString(x, y, (message != "")); + bool playersHere = (GameServer.GetUsersAt(x, y, true, true).Length >= 1); + message += buildNearbyString(x, y, playersHere); // Dropped Items DroppedItems.DroppedItem[] Items = DroppedItems.GetItemsAt(x, y); @@ -2701,7 +2702,7 @@ namespace HISP.Game break; } - if((statCalculator.BreedValue + trainer.ImprovesAmount) < statCalculator.MaxValue) + if(statCalculator.BreedValue < statCalculator.MaxValue) message += Messages.FormatTrainerTrainInEntry(horse.Name, statCalculator.BreedValue, statCalculator.MaxValue, horse.RandomId); else message += Messages.FormatTrainerFullyTrained(horse.Name, statCalculator.BreedValue);