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

Updates Message Packets (#321)

Browse source 
### API Breaking Change
Combined `AsciiMessage` and `UnicodeMessage` into a single function that takes two arguments, `bool ascii` and `string lang`. Lang can be null (or anything) if ascii is true. 

- [X] Changes message packets
- [X] Cleans up some code
- [X] Uses benchmarks to determine if the spanwriter + copyfrom
This commit is contained in:
Kamron Batman 2020-11-20 21:50:13 -08:00 • committed by GitHub
parent 10d884fe30
commit b6cd408623
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 1160 additions and 1025 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Projects/UOContent/Engines/ConPVP/Games/CTF.cs
View file

@ -291,17 +291,16 @@ namespace Server.Engines.ConPVP
{
if (Location == m_TeamInfo.Origin && Map == m_TeamInfo.Game.Facet)
{
from.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"ENU",
Name,
"Touch me not for I am chaste."
)
from.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
Name,
"Touch me not for I am chaste."
);
}
else

39
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -487,38 +487,47 @@ namespace Server.Engines.Doom
public static void PlayerSendASCII(Mobile player, int index)
{
player.Send(
new AsciiMessage(
Serial.MinusOne,
0xFFFF,
MessageType.Label,
MsgParams[index][0],
MsgParams[index][1],
null,
Msgs[index]
)
player.NetState.SendMessage(
Serial.MinusOne,
0xFFFF,
MessageType.Label,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
null,
Msgs[index]
);
}
/* I cant find any better way to send "speech" using fonts other than default */
public static void POHMessage(Mobile from, int index)
{
Packet p = new AsciiMessage(
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Regular,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
from.Name,
Msgs[index]
);
p.Acquire();
foreach (var state in from.Map.GetClientsInRange(from.Location))
buffer = buffer.Slice(0, length); // Adjust to the actual size
var eable = from.Map.GetClientsInRange(from.Location);
foreach (var state in eable)
{
state.Send(p);
state.Send(buffer);
}
Packet.Release(p);
eable.Free();
}
public override void Serialize(IGenericWriter writer)

4
Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -192,9 +192,7 @@ namespace Server.Factions
public void PrivateOverheadLocalizedMessage(Mobile to, int number, int hue, string name, string args)
{
var ns = to?.NetState;
ns?.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args));
to?.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args);
}
public virtual bool CheckDecay()

56
Projects/UOContent/Engines/MLQuests/Mobiles/SirHelper.cs
View file

@ -90,37 +90,35 @@ namespace Server.Engines.MLQuests.Mobiles
{
base.OnThink();
if (m_NextShout <= DateTime.UtcNow)
if (m_NextShout > DateTime.UtcNow)
{
Packet shoutPacket = null;
foreach (var state in GetClientsInRange(12))
{
var m = state.Mobile;
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
shoutPacket ??= Packet.Acquire(
new MessageLocalized(
Serial,
Body,
MessageType.Regular,
946,
3,
1078099,
Name,
""
)
); // Double Click On Me For Help!
state.Send(shoutPacket);
}
}
Packet.Release(shoutPacket);
m_NextShout = DateTime.UtcNow + m_ShoutDelay;
return;
}
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")];
var packetCreated = false;
foreach (var state in GetClientsInRange(12))
{
var m = state.Mobile;
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
if (!packetCreated)
{
// Double Click On Me For Help!
var length = OutgoingMessagePackets.CreateMessageLocalized(
ref buffer,
Serial, Body, MessageType.Regular, 946, 3, 1078099, Name
);
packetCreated = true;
}
state.Send(buffer);
}
}
m_NextShout = DateTime.UtcNow + m_ShoutDelay;
}
private void EndLock(Mobile m)

187
Projects/UOContent/Engines/Party/Party.cs
View file

@ -239,22 +239,25 @@ namespace Server.Engines.PartySystem
return;
}
// : joined the party.
SendToAll(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008094,
"",
AffixType.Prepend | AffixType.System,
from.Name,
""
)
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(from.Name, "")];
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
ref buffer,
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008094,
"",
AffixType.Prepend | AffixType.System,
from.Name
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
// : joined the party.
SendToAll(ref buffer, true);
from.SendLocalizedMessage(1005445); // You have been added to the party.
Candidates.Remove(from);
@ -288,32 +291,31 @@ namespace Server.Engines.PartySystem
if (m == Leader)
{
Disband();
return;
}
else
for (var i = 0; i < Members.Count; ++i)
{
for (var i = 0; i < Members.Count; ++i)
if (Members[i].Mobile == m)
{
if (Members[i].Mobile == m)
{
Members.RemoveAt(i);
Members.RemoveAt(i);
m.Party = null;
m.Send(new PartyEmptyList(m));
m.Party = null;
m.Send(new PartyEmptyList(m));
m.SendLocalizedMessage(1005451); // You have been removed from the party.
m.SendLocalizedMessage(1005451); // You have been removed from the party.
SendToAll(new PartyRemoveMember(m, this));
SendToAll(1005452); // A player has been removed from your party.
SendToAll(new PartyRemoveMember(m, this));
SendToAll(1005452); // A player has been removed from your party.
break;
}
break;
}
}
if (Members.Count == 1)
{
SendToAll(1005450); // The last person has left the party...
Disband();
}
if (Members.Count == 1)
{
SendToAll(1005450); // The last person has left the party...
Disband();
}
}
@ -357,19 +359,16 @@ namespace Server.Engines.PartySystem
}
// : You are invited to join the party. Type /accept to join or /decline to decline the offer.
target.Send(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008089,
"",
AffixType.Prepend | AffixType.System,
from.Name,
""
)
target.NetState.SendMessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008089,
"",
AffixType.Prepend | AffixType.System,
from.Name
);
from.SendLocalizedMessage(1008090); // You have invited them to join the party.
@ -380,19 +379,17 @@ namespace Server.Engines.PartySystem
DeclineTimer.Start(target, from);
}
public void SendToAll(int number)
public void SendToAll(int number, string args = "", int hue = 0x3B2)
{
SendToAll(number, "", 0x3B2);
}
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)];
var length = OutgoingMessagePackets.CreateMessageLocalized(
ref buffer,
Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args
);
public void SendToAll(int number, string args)
{
SendToAll(number, args, 0x3B2);
}
buffer = buffer.Slice(0, length); // Adjust to the actual size
public void SendToAll(int number, string args, int hue)
{
SendToAll(new MessageLocalized(Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args));
SendToAll(ref buffer, true);
}
public void SendPublicMessage(Mobile from, string text)
@ -431,7 +428,20 @@ namespace Server.Engines.PartySystem
private void SendToStaffMessage(Mobile from, string text)
{
Packet p = null;
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
foreach (var ns in from.GetClientsInRange(8))
{
@ -440,27 +450,9 @@ namespace Server.Engines.PartySystem
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel &&
mob.Party != this && !m_Listeners.Contains(mob))
{
if (p == null)
{
p = Packet.Acquire(
new UnicodeMessage(
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
from.Language,
from.Name,
text
)
);
}
ns.Send(p);
ns.Send(buffer);
}
}
Packet.Release(p);
}
private void SendToStaffMessage(Mobile from, string format, params object[] args)
@ -477,7 +469,17 @@ namespace Server.Engines.PartySystem
Members[i].Mobile.Send(p);
}
if (p is MessageLocalized || p is MessageLocalizedAffix || p is UnicodeMessage || p is AsciiMessage)
p.Release();
}
public void SendToAll(ref Span<byte> span, bool isSpeech)
{
for (var i = 0; i < Members.Count; ++i)
{
Members[i].Mobile.NetState?.Send(span);
}
if (isSpeech)
{
for (var i = 0; i < m_Listeners.Count; ++i)
{
@ -485,12 +487,10 @@ namespace Server.Engines.PartySystem
if (mob.Party != this)
{
mob.Send(p);
mob.NetState?.Send(span);
}
}
}
p.Release();
}
private class RejoinTimer : Timer
@ -511,20 +511,22 @@ namespace Server.Engines.PartySystem
m_Mobile.SendLocalizedMessage(1005437); // You have rejoined the party.
m_Mobile.Send(new PartyMemberList(p));
var message = Packet.Acquire(
new MessageLocalizedAffix(
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008087,
"",
AffixType.Prepend | AffixType.System,
m_Mobile.Name,
""
)
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")];
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
ref buffer,
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008087,
"",
AffixType.Prepend | AffixType.System,
m_Mobile.Name
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
var attrs = Packet.Acquire(new MobileAttributesN(m_Mobile));
foreach (var mi in p.Members)
@ -533,7 +535,7 @@ namespace Server.Engines.PartySystem
if (m != m_Mobile)
{
m.Send(message);
m.NetState?.Send(buffer);
m.Send(new MobileStatusCompact(m_Mobile.CanBeRenamedBy(m), m_Mobile));
m.Send(attrs);
m_Mobile.Send(new MobileStatusCompact(m.CanBeRenamedBy(m_Mobile), m));
@ -541,7 +543,6 @@ namespace Server.Engines.PartySystem
}
}
Packet.Release(message);
Packet.Release(attrs);
}
}

57
Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -189,17 +189,13 @@ namespace Server.Engines.Quests.Collector
{
if (!IsChildOf(from.Backpack))
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x2C,
3,
500309,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x2C,
3,
500309
); // Nothing Happens.
}
else
@ -286,33 +282,30 @@ namespace Server.Engines.Quests.Collector
targObsidian.StatueName = RandomName(from);
}
from.Send(
new AsciiMessage(
targObsidian.Serial,
targObsidian.ItemID,
MessageType.Regular,
0x59,
3,
m_Obsidian.Name,
"Something Happened."
)
from.NetState.SendMessage(
targObsidian.Serial,
targObsidian.ItemID,
MessageType.Regular,
0x59,
3,
true,
null,
m_Obsidian.Name,
"Something Happened."
);
return;
}
}
from.Send(
new MessageLocalized(
m_Obsidian.Serial,
m_Obsidian.ItemID,
MessageType.Regular,
0x2C,
3,
500309,
m_Obsidian.Name,
""
)
from.NetState.SendMessageLocalized(
m_Obsidian.Serial,
m_Obsidian.ItemID,
MessageType.Regular,
0x2C,
3,
500309,
m_Obsidian.Name
); // Nothing Happens.
}
}

23
Projects/UOContent/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -102,18 +102,15 @@ namespace Server.Items
banks = m_IlshenarBanks;
moongates = PMList.Ilshenar;
#else
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
0x482,
3,
1061684,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
0x482,
3,
1061684
); // The magic of the sextant fails...
return;
#endif
}
@ -176,7 +173,7 @@ namespace Server.Items
moonMsg = 1048018; // You are next to a Moongate at the moment.
}
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, 0x482, 3, moonMsg, "", ""));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x482, 3, moonMsg);
int bankMsg;
if (bankDistance == double.MaxValue)
@ -196,7 +193,7 @@ namespace Server.Items
bankMsg = 1048019; // You are next to a Bank at the moment.
}
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, 0x5AA, 3, bankMsg, "", ""));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x5AA, 3, bankMsg);
}
public override void Serialize(IGenericWriter writer)

38
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs
View file

@ -89,32 +89,26 @@ namespace Server.Engines.Quests.Haven
if (ItemID == 0x2006) // Corpse form
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049144,
"",
Name
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049144,
"",
Name
); // the remains of ~1_NAME~ the apprentice
}
else
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049145,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049145
); // the remains of a wizard's apprentice
}
}

38
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs
View file

@ -127,32 +127,26 @@ namespace Server.Engines.Quests.Haven
if (ItemID == 0x2006) // Corpse form
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049318,
"",
Name
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049318,
"",
Name
); // the remains of ~1_NAME~ the militia fighter
}
else
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049319,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Label,
hue,
3,
1049319
); // the remains of a militia fighter
}
}

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -48,7 +48,7 @@ namespace Server.Engines.Quests.Hag
{
var hue = Notoriety.GetHue(NotorietyHandlers.CorpseNotoriety(from, this));
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Label, hue, 3, "", "a charred corpse"));
from.NetState.SendMessage(Serial, ItemID, MessageType.Label, hue, 3, true, null, "", "a charred corpse");
}
public override void Open(Mobile from, bool checkSelfLoot)

2
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -2036,7 +2036,7 @@ namespace Server.Items
return;
}
from.NetState?.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
from.NetState.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
}
[Flags]

2
Projects/UOContent/Items/Clothing/BaseClothing.cs
View file

@ -880,7 +880,7 @@ namespace Server.Items
return;
}
from.NetState?.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
from.NetState.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
}
public virtual void AddEquipInfoAttributes(Mobile from, List<EquipInfoAttribute> attrs)

2
Projects/UOContent/Items/Containers/LockableContainer.cs
View file

@ -279,7 +279,7 @@ namespace Server.Items
inaccessible = true;
}
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", ""));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number);
}
return inaccessible;

4
Projects/UOContent/Items/Containers/TrappableContainer.cs
View file

@ -51,7 +51,7 @@ namespace Server.Items
return;
}
to.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, "", ""));
to.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number);
}
private void SendMessageTo(Mobile to, string text, int hue)
@ -61,7 +61,7 @@ namespace Server.Items
return;
}
to.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
to.NetState.SendMessage(Serial, ItemID, MessageType.Regular, hue, 3, false, "ENU", "", text);
}
public virtual bool ExecuteTrap(Mobile from)

18
Projects/UOContent/Items/Guilds/Guildstone.cs
View file

@ -276,17 +276,13 @@ namespace Server.Items
}
else if (from.AccessLevel < AccessLevel.GameMaster && !Guild.IsMember(from))
{
from.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
501158,
"",
""
)
from.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
501158
); // You are not a member ...
}
else

25
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -519,7 +519,7 @@ namespace Server.Items
if (m_Completed)
{
list.Add(1041507, m_CompletedBy == null ? "someone" : m_CompletedBy.Name); // completed by ~1_val~
list.Add(1041507, m_CompletedBy?.RawName ?? "someone"); // completed by ~1_val~
}
}
@ -527,19 +527,16 @@ namespace Server.Items
{
if (m_Completed)
{
from.Send(
new MessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1048030,
"",
AffixType.Append,
$" completed by {(m_CompletedBy == null ? "someone" : m_CompletedBy.Name)}",
""
)
from.NetState.SendMessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1048030,
"",
AffixType.Append,
$" completed by {m_CompletedBy?.RawName ?? "someone"}"
);
}
else if (m_Decoder != null)

23
Projects/UOContent/Items/Misc/BankCheck.cs
View file

@ -153,19 +153,16 @@ namespace Server.Items
public override void OnSingleClick(Mobile from)
{
from.Send(
new MessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1041361,
"",
AffixType.Append,
$" {m_Worth}",
""
)
from.NetState.SendMessageLocalizedAffix(
Serial,
ItemID,
MessageType.Label,
0x3B2,
3,
1041361,
"",
AffixType.Append,
$" {m_Worth}"
); // A bank check:
}

8
Projects/UOContent/Items/Misc/Corpses/Corpse.cs
View file

@ -1168,7 +1168,7 @@ namespace Server.Items
if (opl.Header > 0)
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, opl.Header, Name, opl.HeaderArgs);
}
}
@ -1180,16 +1180,16 @@ namespace Server.Items
{
if (m_CorpseName != null)
{
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Label, hue, 3, "", m_CorpseName));
from.NetState.SendMessage(Serial, ItemID, MessageType.Label, hue, 3, true, null, "", m_CorpseName);
}
else
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name);
}
}
else // Bone form
{
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, hue, 3, 1046414, "", Name);
}
}

6
Projects/UOContent/Items/Misc/Key.cs
View file

@ -249,14 +249,14 @@ namespace Server.Items
{
desc = "(blank)";
}
else if ((desc = m_Description) == null || (desc = desc.Trim()).Length <= 0)
else
{
desc = "";
desc = m_Description?.Trim() ?? "";
}
if (desc.Length > 0)
{
from.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, 0x3B2, 3, "ENU", "", desc));
from.NetState.SendMessage(Serial, ItemID, MessageType.Regular, 0x3B2, 3, false, "ENU", "", desc);
}
}

22
Projects/UOContent/Items/Misc/PowerGenerator.cs
View file

@ -216,18 +216,18 @@ namespace Server.Items
public void DoDamage(Mobile to)
{
to.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"",
"",
"The generator shoots an arc of electricity at you!"
)
to.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
"",
"The generator shoots an arc of electricity at you!"
);
to.BoltEffect(0);
to.LocalOverheadMessage(MessageType.Regular, 0xC9, true, "* Your body convulses from electric shock *");
to.NonlocalOverheadMessage(MessageType.Regular, 0xC9, true, $"* {to.Name} spasms from electric shock *");

40
Projects/UOContent/Items/Misc/Teleporter.cs
View file

@ -429,32 +429,28 @@ namespace Server.Items
{
if (m_MessageString != null)
{
m.Send(
new UnicodeMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
"ENU",
null,
m_MessageString
)
m.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
false,
"ENU",
null,
m_MessageString
);
}
else if (m_MessageNumber != 0)
{
m.Send(
new MessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
m_MessageNumber,
null,
""
)
m.NetState.SendMessageLocalized(
Serial,
ItemID,
MessageType.Regular,
0x3B2,
3,
m_MessageNumber,
null
);
}

6
Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs
View file

@ -61,10 +61,8 @@ namespace Server.Items
public override void OnSingleClick(Mobile from)
{
var number = Amount == 1 ? 1049122 : 1049121;
from.Send(
new MessageLocalized(Serial, ItemID, MessageType.Label, 0x3B2, 3, number, "", (Amount * 50).ToString())
);
var amount = (Amount * 50).ToString();
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Label, 0x3B2, 3, number, "", amount);
}
}
}

2
Projects/UOContent/Items/Resources/Tailor/Cloth.cs
View file

@ -62,7 +62,7 @@ namespace Server.Items
{
var number = Amount == 1 ? 1049124 : 1049123;
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", Amount.ToString()));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", Amount.ToString());
}
}
}

2
Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs
View file

@ -62,7 +62,7 @@ namespace Server.Items
{
var number = Amount == 1 ? 1049124 : 1049123;
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", Amount.ToString()));
from.NetState.SendMessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", Amount.ToString());
}
}
}

2
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

@ -696,7 +696,7 @@ namespace Server.Items
else if (Parent is Mobile)
{
// What will happen if the client doesn't know about our parent?
to.NetState?.SendEquipUpdate(this);
to.NetState.SendEquipUpdate(this);
}
if (ns.HighSeas)

2
Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -469,7 +469,7 @@ namespace Server.Items
return;
}
from.NetState?.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
from.NetState.SendDisplayEquipmentInfo(Serial, number, m_Crafter?.RawName, false, attrs);
}
public override void Serialize(IGenericWriter writer)

47
Projects/UOContent/Items/Skill Items/Tinkering/Spyglass.cs
View file

@ -22,33 +22,28 @@ namespace Server.Items
1008155
); // You peer into the heavens, seeking the moons...
from.Send(
new MessageLocalizedAffix(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
1008146 + (int)Clock.GetMoonPhase(Map.Trammel, from.X, from.Y),
"",
AffixType.Prepend,
"Trammel : ",
""
)
from.NetState.SendMessageLocalizedAffix(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
1008146 + (int)Clock.GetMoonPhase(Map.Trammel, from.X, from.Y),
"",
AffixType.Prepend,
"Trammel : "
);
from.Send(
new MessageLocalizedAffix(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
1008146 + (int)Clock.GetMoonPhase(Map.Felucca, from.X, from.Y),
"",
AffixType.Prepend,
"Felucca : ",
""
)
from.NetState.SendMessageLocalizedAffix(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
1008146 + (int)Clock.GetMoonPhase(Map.Felucca, from.X, from.Y),
"",
AffixType.Prepend,
"Felucca : "
);
if (from is PlayerMobile player)

20
Projects/UOContent/Items/Special/Solen Items/BagOfSending.cs
View file

@ -260,16 +260,16 @@ namespace Server.Items
}
else if (item is BagOfSending || item is Container)
{
from.Send(
new AsciiMessage(
m_Bag.Serial,
m_Bag.ItemID,
MessageType.Regular,
0x3B2,
3,
"",
"You cannot send a container through the bag of sending."
)
from.NetState.SendMessage(
m_Bag.Serial,
m_Bag.ItemID,
MessageType.Regular,
0x3B2,
3,
true,
null,
"",
"You cannot send a container through the bag of sending."
);
}
else if (item.LootType == LootType.Cursed)

20
Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -226,16 +226,16 @@ namespace Server.Items
else if (from.Map == Map.Ilshenar || from.Region.IsPartOf<DungeonRegion>() ||
from.Region.IsPartOf<JailRegion>() || from.Region.IsPartOf<SafeZone>())
{
from.Send(
new AsciiMessage(
Serial,
ItemID,
MessageType.Regular,
0x22,
3,
"",
"You cannot summon your pet to this location."
)
from.NetState.SendMessage(
Serial,
ItemID,
MessageType.Regular,
0x22,
3,
true,
null,
"",
"You cannot summon your pet to this location."
);
}
else if (Core.ML && from is PlayerMobile mobile && DateTime.UtcNow < mobile.LastPetBallTime.AddSeconds(15.0))

4
Projects/UOContent/Items/Special/Solen Items/MessageHelper.cs
View file

@ -11,12 +11,12 @@ namespace Server
public static void SendLocalizedMessageTo(Item from, Mobile to, int number, string args, int hue)
{
to.Send(new MessageLocalized(from.Serial, from.ItemID, MessageType.Regular, hue, 3, number, "", args));
to.NetState.SendMessageLocalized(from.Serial, from.ItemID, MessageType.Regular, hue, 3, number, "", args);
}
public static void SendMessageTo(Item from, Mobile to, string text, int hue)
{
to.Send(new UnicodeMessage(from.Serial, from.ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
to.NetState.SendMessage(from.Serial, from.ItemID, MessageType.Regular, hue, 3, false, "ENU", "", text);
}
}
}

2
Projects/UOContent/Items/Wands/BaseWand.cs
View file

@ -268,7 +268,7 @@ namespace Server.Items
return;
}
from.NetState?.SendDisplayEquipmentInfo(Serial, number, Crafter?.RawName, false, attrs);
from.NetState.SendDisplayEquipmentInfo(Serial, number, Crafter?.RawName, false, attrs);
}
public void Cast(Spell spell)

2
Projects/UOContent/Items/Weapons/Ranged/BaseRanged.cs
View file

@ -83,7 +83,7 @@ namespace Server.Items
if (canSwing && attacker.HarmfulCheck(defender))
{
attacker.DisruptiveAction();
attacker.NetState?.SendSwing(attacker.Serial, defender.Serial);
attacker.NetState.SendSwing(attacker.Serial, defender.Serial);
if (OnFired(attacker, defender))
{

65
Projects/UOContent/Misc/Guild.cs
View file

@ -343,38 +343,31 @@ namespace Server.Guilds
public void AllianceChat(Mobile from, int hue, string text)
{
Packet p = null;
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Alliance,
hue,
3,
false,
from.Language,
from.Name,
text
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
for (var i = 0; i < m_Members.Count; i++)
{
var g = m_Members[i];
for (var j = 0; j < g.Members.Count; j++)
{
var m = g.Members[j];
var state = m.NetState;
if (state != null)
{
p ??= Packet.Acquire(
new UnicodeMessage(
from.Serial,
from.Body,
MessageType.Alliance,
hue,
3,
from.Language,
from.Name,
text
)
);
state.Send(p);
}
g.Members[j].NetState?.Send(buffer);
}
}
Packet.Release(p);
}
public void AllianceChat(Mobile from, string text)
@ -1512,24 +1505,18 @@ namespace Server.Guilds
public void GuildChat(Mobile from, int hue, string text)
{
Packet p = null;
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial, from.Body, MessageType.Guild, hue, 3, false, from.Language, from.Name, text
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
for (var i = 0; i < Members.Count; i++)
{
var m = Members[i];
var state = m.NetState;
if (state != null)
{
p ??= Packet.Acquire(
new UnicodeMessage(from.Serial, from.Body, MessageType.Guild, hue, 3, from.Language, from.Name, text)
);
state.Send(p);
}
Members[i].NetState?.Send(buffer);
}
Packet.Release(p);
}
public void GuildChat(Mobile from, string text)

33
Projects/UOContent/Mobiles/PlayerMobile.cs
View file

@ -2851,7 +2851,21 @@ namespace Server.Mobiles
private static void SendToStaffMessage(Mobile from, string text)
{
Packet p = null;
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
var length = OutgoingMessagePackets.CreateMessage(
ref buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
buffer = buffer.Slice(0, length); // Adjust to the actual size
foreach (var ns in from.GetClientsInRange(8))
{
@ -2859,24 +2873,9 @@ namespace Server.Mobiles
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel)
{
p ??= Packet.Acquire(
new UnicodeMessage(
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
from.Language,
from.Name,
text
)
);
ns.Send(p);
ns.Send(buffer);
}
}
Packet.Release(p);
}
private static void SendToStaffMessage(Mobile from, string format, params object[] args)

6
Projects/UOContent/Mobiles/Vendors/BaseVendor.cs
View file

@ -1021,13 +1021,13 @@ namespace Server.Mobiles
AddItem(pack);
}
from.NetState?.SendEquipUpdate(pack);
from.NetState.SendEquipUpdate(pack);
pack = FindItemOnLayer(Layer.ShopSell);
if (pack != null)
{
from.NetState?.SendEquipUpdate(pack);
from.NetState.SendEquipUpdate(pack);
}
pack = FindItemOnLayer(Layer.ShopResale);
@ -1038,7 +1038,7 @@ namespace Server.Mobiles
AddItem(pack);
}
from.NetState?.SendEquipUpdate(pack);
from.NetState.SendEquipUpdate(pack);
}
public virtual void VendorSell(Mobile from)

23
Projects/UOContent/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -48,19 +48,16 @@ namespace Server.Mobiles
public virtual void SayPriceTo(Mobile m)
{
m.Send(
new MessageLocalizedAffix(
Serial,
Body,
MessageType.Regular,
SpeechHue,
3,
1008052,
Name,
AffixType.Append,
JoinCost.ToString(),
""
)
m.NetState.SendMessageLocalizedAffix(
Serial,
Body,
MessageType.Regular,
SpeechHue,
3,
1008052,
Name,
AffixType.Append,
JoinCost.ToString()
);
}

2
Projects/UOContent/Multis/HouseFoundation.cs
View file

@ -1980,7 +1980,7 @@ namespace Server.Multis
public void SendGeneralInfoTo(NetState state)
{
state?.Send(new DesignStateGeneral(Foundation, this));
state.Send(new DesignStateGeneral(Foundation, this));
}
public void SendDetailedInfoTo(NetState state)

4
Projects/UOContent/Skills/Tracking/QuestArrow.cs
View file

@ -35,7 +35,7 @@ namespace Server
return;
}
Mobile.NetState?.SendSetArrow(x, y, Target.Serial);
Mobile.NetState.SendSetArrow(x, y, Target.Serial);
}
public void Stop()
@ -51,7 +51,7 @@ namespace Server
}
Mobile.ClearQuestArrow();
Mobile.NetState?.SendCancelArrow(x, y, Target.Serial);
Mobile.NetState.SendCancelArrow(x, y, Target.Serial);
Running = false;
OnStop();

41
Projects/UOContent/SpecialSystems/Engines/TestCenter.cs
View file

@ -226,17 +226,18 @@ namespace Server.Misc
if (sb.Length + 1 + v.Length >= 256)
{
sender.Send(
new AsciiMessage(
Server.Serial.MinusOne,
-1,
MessageType.Label,
0x35,
3,
"System",
sb.ToString()
)
sender.SendMessage(
Server.Serial.MinusOne,
-1,
MessageType.Label,
0x35,
3,
true,
null,
"System",
sb.ToString()
);
sb = new StringBuilder();
sb.Append(v);
}
@ -249,16 +250,16 @@ namespace Server.Misc
if (sb.Length > 0)
{
sender.Send(
new AsciiMessage(
Server.Serial.MinusOne,
-1,
MessageType.Label,
0x35,
3,
"System",
sb.ToString()
)
sender.SendMessage(
Server.Serial.MinusOne,
-1,
MessageType.Label,
0x35,
3,
true,
null,
"System",
sb.ToString()
);
}

19
Projects/UOContent/Spells/Sixth/Mark.cs
View file

@ -26,17 +26,14 @@ namespace Server.Spells.Sixth
{
if (!(item is RecallRune rune))
{
Caster.Send(
new MessageLocalized(
Caster.Serial,
Caster.Body,
MessageType.Regular,
0x3B2,
3,
501797,
Caster.Name,
""
)
Caster.NetState.SendMessageLocalized(
Caster.Serial,
Caster.Body,
MessageType.Regular,
0x3B2,
3,
501797,
Caster.Name
); // I cannot mark that object.
}
else if (!Caster.CanSee(rune))

38
Projects/UOContent/Spells/Targeting/RecallSpellTarget.cs
View file

@ -51,17 +51,14 @@ namespace Server.Spells
}
else
{
from.Send(
new MessageLocalized(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
502357,
from.Name,
""
)
from.NetState.SendMessageLocalized(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
502357,
from.Name
); // I can not recall from that object.
}
}
@ -71,17 +68,14 @@ namespace Server.Spells
}
else
{
from.Send(
new MessageLocalized(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
502357,
from.Name,
""
)
from.NetState.SendMessageLocalized(
from.Serial,
from.Body,
MessageType.Regular,
0x3B2,
3,
502357,
from.Name
); // I can not recall from that object.
}
}