warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Fixes packet issues with hair/beard (#669)

Browse source
This commit is contained in:
Kamron Batman 2021-08-01 19:54:04 -07:00 • committed by GitHub
parent ebac984543
commit f78a226321
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Items/Deeds/HairRestylingDeed.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
private class InternalGump : Gump
{
private readonly int[][] ElvenArray =
private static readonly int[][] ElvenArray =
{
new[] { 0 },
new[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
@ -63,7 +63,7 @@ namespace Server.Items
/*
racial arrays are: cliloc_F, cliloc_M, ItemID_F, ItemID_M, gump_img_F, gump_img_M
*/
private readonly int[][] HumanArray = /* why on earth cant these utilies be consistent with hex/dec */
private static readonly int[][] HumanArray = /* why on earth cant these utilities be consistent with hex/dec */
{
new[] { 0 },
new[] { 1011064, 1011064, 0, 0, 0, 0 }, // bald
@ -77,11 +77,11 @@ namespace Server.Items
new[] { 1011050, 1011050, 0x204A, 0x204A, 0xED29, 0xED29 }, // Topknot
new[] { 1011396, 1011396, 0x2047, 0x2047, 0xed25, 0xc618 } // Curly
};
/*
gump data: bgX, bgY, htmlX, htmlY, imgX, imgY, butX, butY
*/
private readonly int[][] LayoutArray =
private static readonly int[][] LayoutArray =
{
new[] { 0 }, /* padding: its more efficient than code to ++ the index/buttonid */
new[] { 425, 280, 342, 295, 000, 000, 310, 292 },

12
Projects/UOContent/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -416,9 +416,9 @@ namespace Server.Mobiles
m_Vendor.PrivateOverheadMessage(
MessageType.Regular,
0x3B2,
1042293,
1042293, // You cannot afford my services for that style.
m_From.NetState
); // You cannot afford my services for that style.
);
return;
}
@ -439,9 +439,9 @@ namespace Server.Mobiles
m_Vendor.PrivateOverheadMessage(
MessageType.Regular,
0x3B2,
502623,
502623, // You have no hair to dye and you cannot use this.
m_From.NetState
); // You have no hair to dye and you cannot use this.
);
}
}
}
@ -638,9 +638,9 @@ namespace Server.Mobiles
m_Vendor.PrivateOverheadMessage(
MessageType.Regular,
0x3B2,
1042293,
1042293, // You cannot afford my services for that style.
m_From.NetState
); // You cannot afford my services for that style.
);
}
}
else