From c58326ffba7b7117e0601227222e22c06b24c83d Mon Sep 17 00:00:00 2001 From: Bluzume <39113159+KuromeSan@users.noreply.github.com> Date: Sat, 6 Nov 2021 22:53:06 -0400 Subject: [PATCH] fix camel gear not being equipable by anyone --- HorseIsleServer/HorseIsleServer/Game/Items/Item.cs | 4 +++- HorseIsleServer/HorseIsleServer/Game/Meta.cs | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/HorseIsleServer/HorseIsleServer/Game/Items/Item.cs b/HorseIsleServer/HorseIsleServer/Game/Items/Item.cs index 754269c..735dac5 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Items/Item.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Items/Item.cs @@ -43,7 +43,9 @@ namespace HISP.Game.Items public int GetMiscFlag(int no) { - if (MiscFlags.Length <= no) + if (no < 0) + return 0; + if (no >= MiscFlags.Length) return 0; else return MiscFlags[no]; diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs index 0ce47a6..4bd3b16 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs @@ -2512,14 +2512,14 @@ namespace HISP.Game foreach(InventoryItem item in user.Inventory.GetItemList()) { - Item.ItemInformation itemInfo = item.ItemInstances[0].GetItemInfo(); + Item.ItemInformation itemInfo = Item.GetItemById(item.ItemId); if (itemInfo.Type == "TACK") { - if (horse.Breed.Type == "camel" && itemInfo.GetMiscFlag(2) != 1) + if (horse.Breed.Type == "camel" && itemInfo.GetMiscFlag(1) != 1) continue; - else if (horse.Breed.Type == "llama" && itemInfo.GetMiscFlag(2) != 2) + else if (horse.Breed.Type == "llama" && itemInfo.GetMiscFlag(1) != 2) continue; - else if (itemInfo.GetMiscFlag(2) != 0) + else if (itemInfo.GetMiscFlag(1) != 0) continue; message += Messages.FormatHorseEquip(itemInfo.IconId, item.ItemInstances.Length, itemInfo.Name, itemInfo.Id); }