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

fix(core): Cleans up uninitialized packets (#397)

Browse source 
- [X] Encapsulates/abstracts buffer cache checking
- [X] Changes mobile moving cache to use Span2D
This commit is contained in:
Kamron Batman 2021-01-09 14:10:29 -08:00 • committed by GitHub
parent 0b9fb9c071
commit 8763be8a21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 417 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/UOContent/Commands/Handlers.cs
View file

@ -416,18 +416,13 @@ namespace Server.Commands
toAll
);
Span<byte> buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket();
foreach (var state in m.GetClientsInRange(12))
{
if (toAll || state.Mobile.CanSee(m))
{
if (buffer[0] == 0)
{
OutgoingEffectPackets.CreateSoundEffect(buffer, index, m);
}
OutgoingEffectPackets.CreateSoundEffect(buffer, index, m);
state.Send(buffer);
}
}

9
Projects/UOContent/Commands/VisibilityList.cs
View file

@ -69,8 +69,7 @@ namespace Server.Commands
if (list.Count > 0)
{
Span<byte> removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength];
removeEntity.InitializePacket();
Span<byte> removeEntity = stackalloc byte[OutgoingEntityPackets.RemoveEntityLength].InitializePacket();
for (var i = 0; i < list.Count; ++i)
{
@ -78,11 +77,7 @@ namespace Server.Commands
if (!m.CanSee(pm) && Utility.InUpdateRange(m, pm))
{
if (removeEntity[0] == 0)
{
OutgoingEntityPackets.CreateRemoveEntity(removeEntity, pm.Serial);
}
OutgoingEntityPackets.CreateRemoveEntity(removeEntity, pm.Serial);
m.NetState?.Send(removeEntity);
}
}

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

@ -503,28 +503,27 @@ namespace Server.Engines.Doom
/* I cant find any better way to send "speech" using fonts other than default */
public static void POHMessage(Mobile from, int index)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(Msgs[index])].InitializePacket();
var eable = from.Map.GetClientsInRange(from.Location);
foreach (var state in eable)
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
from.Name,
Msgs[index]
);
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
MsgParams[index][0],
MsgParams[index][1],
true,
null,
from.Name,
Msgs[index]
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}

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

@ -95,8 +95,7 @@ namespace Server.Engines.MLQuests.Mobiles
return;
}
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength("")].InitializePacket();
foreach (var state in GetClientsInRange(12))
{
@ -104,13 +103,13 @@ namespace Server.Engines.MLQuests.Mobiles
if (m.CanSee(this) && m.InLOS(this) && m.CanBeginAction(this))
{
if (buffer[0] == 0)
{
// Double Click On Me For Help!
var length = OutgoingMessagePackets.CreateMessageLocalized(
buffer, Serial, Body, MessageType.Regular, 946, 3, 1078099, Name
);
// Double Click On Me For Help!
var length = OutgoingMessagePackets.CreateMessageLocalized(
buffer, Serial, Body, MessageType.Regular, 946, 3, 1078099, Name
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length);
}

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

@ -370,7 +370,8 @@ namespace Server.Engines.PartySystem
public void SendToAll(int number, string args = "", int hue = 0x3B2)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)];
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedLength(args)].InitializePacket();
var length = OutgoingMessagePackets.CreateMessageLocalized(
buffer,
Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args
@ -415,8 +416,7 @@ namespace Server.Engines.PartySystem
private void SendToStaffMessage(Mobile from, string text)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket();
foreach (var ns in from.GetClientsInRange(8))
{
@ -425,21 +425,21 @@ namespace Server.Engines.PartySystem
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel &&
mob.Party != this && !m_Listeners.Contains(mob))
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}
@ -504,8 +504,7 @@ namespace Server.Engines.PartySystem
m_Mobile.SendLocalizedMessage(1005437); // You have rejoined the party.
m_Mobile.Send(new PartyMemberList(p));
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLocalizedAffixLength(m_Mobile.Name, "")].InitializePacket();
Span<byte> attrsPacket = stackalloc byte[OutgoingMobilePackets.MobileAttributesPacketLength];
OutgoingMobilePackets.CreateMobileAttributes(attrsPacket, m_Mobile, true);
@ -516,32 +515,34 @@ namespace Server.Engines.PartySystem
{
var m = mi.Mobile;
if (m != m_Mobile)
if (m == m_Mobile)
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
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
}
m.NetState?.Send(buffer);
m.NetState.SendMobileStatusCompact(m_Mobile, m_Mobile.CanBeRenamedBy(m));
m.NetState?.Send(attrsPacket);
ns.SendMobileStatusCompact(m, m.CanBeRenamedBy(m_Mobile));
ns.SendMobileAttributes(m, true);
continue;
}
var length = OutgoingMessagePackets.CreateMessageLocalizedAffix(
buffer,
Serial.MinusOne,
-1,
MessageType.Label,
0x3B2,
3,
1008087,
"",
AffixType.Prepend | AffixType.System,
m_Mobile.Name
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}
m.NetState?.Send(buffer);
m.NetState.SendMobileStatusCompact(m_Mobile, m_Mobile.CanBeRenamedBy(m));
m.NetState?.Send(attrsPacket);
ns.SendMobileStatusCompact(m, m.CanBeRenamedBy(m_Mobile));
ns.SendMobileAttributes(m, true);
}
}
}

9
Projects/UOContent/Items/Games/BaseBoard.cs
View file

@ -87,16 +87,11 @@ namespace Server.Items
}
else
{
Span<byte> buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingEffectPackets.SoundPacketLength].InitializePacket();
foreach (var state in GetClientsInRange(2))
{
if (buffer[0] == 0)
{
OutgoingEffectPackets.CreateSoundEffect(buffer, 0x127, GetWorldLocation());
}
OutgoingEffectPackets.CreateSoundEffect(buffer, 0x127, GetWorldLocation());
state.Send(buffer);
}
}

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

@ -330,8 +330,7 @@ namespace Server.Guilds
public void AllianceChat(Mobile from, int hue, string text)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket();
for (var i = 0; i < m_Members.Count; i++)
{
@ -339,21 +338,21 @@ namespace Server.Guilds
for (var j = 0; j < g.Members.Count; j++)
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Alliance,
hue,
3,
false,
from.Language,
from.Name,
text
);
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Alliance,
hue,
3,
false,
from.Language,
from.Name,
text
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}
@ -1520,18 +1519,17 @@ namespace Server.Guilds
public void GuildChat(Mobile from, int hue, string text)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket();
for (var i = 0; i < Members.Count; i++)
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessage(
buffer, from.Serial, from.Body, MessageType.Guild, hue, 3, false, from.Language,
from.Name, text
);
var length = OutgoingMessagePackets.CreateMessage(
buffer, from.Serial, from.Body, MessageType.Guild, hue, 3, false, from.Language,
from.Name, text
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}

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

@ -2818,8 +2818,7 @@ namespace Server.Mobiles
private static void SendToStaffMessage(Mobile from, string text)
{
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)];
buffer.InitializePacket();
Span<byte> buffer = stackalloc byte[OutgoingMessagePackets.GetMaxMessageLength(text)].InitializePacket();
foreach (var ns in from.GetClientsInRange(8))
{
@ -2827,21 +2826,21 @@ namespace Server.Mobiles
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel)
{
if (buffer[0] == 0)
{
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
var length = OutgoingMessagePackets.CreateMessage(
buffer,
from.Serial,
from.Body,
MessageType.Regular,
from.SpeechHue,
3,
false,
from.Language,
from.Name,
text
);
if (length != buffer.Length)
{
buffer = buffer.Slice(0, length); // Adjust to the actual size
}