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

fix: Fixes various mobile packets and setting serials (#1618)

Browse source 
### Summary
- Removes old death packet that isn't used. Doubtful this causes issues with clients that are v4+.
- Removes duplicate incoming packets. Again, probably to fix some old client issues, doubtful it affects clients v4+.
- Fixes setting serials and entities in props/commands. Note: Disabled setting `Parent` since the new sector code has issues. We shouldn't rely on it anyway!
- Reverts a recent change to healthbars that should not have been made. Oops!
This commit is contained in:
Kamron Batman 2023-11-26 00:42:15 -08:00 • committed by GitHub
parent 332e22f509
commit 6a0fcd62c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Server.Tests/Tests/Network/Packets/Outgoing/PlayerPacketTests.cs
View file

@ -42,15 +42,13 @@ namespace Server.Tests.Network
AssertThat.Equal(result, expected);
}
[Theory]
[InlineData(false)]
[InlineData(true)]
public void TestDeathStatus(bool dead)
[Fact]
public void TestDeathStatus()
{
var expected = new DeathStatus(dead).Compile();
var expected = new DeathStatus(false).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDeathStatus(dead);
ns.SendDeathStatus();
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);

3
Projects/Server/Items/Item.cs
View file

@ -585,7 +585,8 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
}
}
[CommandProperty(AccessLevel.GameMaster, AccessLevel.Developer)]
// Note: Setting the parent via command/props causes problems.
[CommandProperty(AccessLevel.GameMaster, readOnly: true)]
public IEntity Parent
{
get => m_Parent;

15
Projects/Server/Mobiles/Mobile.cs
View file

@ -4564,7 +4564,6 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
}
}
SendIncomingPacket();
SendIncomingPacket();
OnAfterResurrect();
@ -4860,7 +4859,7 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
}
else
{
m_NetState.SendDeathStatus(true);
m_NetState.SendDeathStatus();
Warmode = false;
@ -4886,8 +4885,6 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
ProcessDelta();
m_NetState.SendDeathStatus(false);
CheckStatTimers();
}
}
@ -6923,14 +6920,8 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
if (ns.StygianAbyss)
{
if (m.Blessed || m.YellowHealthbar)
{
ns.SendMobileHealthbar(m, Healthbar.Yellow);
}
else if (m.Poisoned)
{
ns.SendMobileHealthbar(m, Healthbar.Poison);
}
ns.SendMobileHealthbar(m, Healthbar.Yellow);
ns.SendMobileHealthbar(m, Healthbar.Poison);
}
if (m.IsDeadBondedPet)

4
Projects/Server/Network/Packets/OutgoingPlayerPackets.cs
View file

@ -60,8 +60,8 @@ public static class OutgoingPlayerPackets
ns?.Send(stackalloc byte[] { 0xC8, range });
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void SendDeathStatus(this NetState ns, bool dead) =>
ns?.Send(stackalloc byte[] { 0x2C, dead ? (byte)0 : (byte)2 });
public static void SendDeathStatus(this NetState ns) =>
ns?.Send(stackalloc byte[] { 0x2C, 2 });
public static void SendDisplayProfile(this NetState ns, Serial m, string header, string body, string footer)
{

2
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -303,7 +303,7 @@ namespace Server.Gumps
var type = prop.PropertyType;
if (IsType(type, OfMobile) || IsType(type, OfItem))
if (IsType(type, OfEntity))
{
from.SendGump(new SetObjectGump(prop, from, m_Object, type, this));
}

2
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -3223,7 +3223,6 @@ namespace Server.Mobiles
ProcessDelta();
SendIncomingPacket();
SendIncomingPacket();
// TODO: This can be done in Parallel if there are lots of them.
var aggressors = Aggressors;
@ -3841,7 +3840,6 @@ namespace Server.Mobiles
OutgoingMobilePackets.CreateBondedStatus(buffer, Serial, false);
Effects.SendPacket(Location, Map, buffer);
SendIncomingPacket();
SendIncomingPacket();
OnAfterResurrect();

32
Projects/UOContent/Utilities/Types.cs
View file

@ -137,8 +137,9 @@ namespace Server
{
constructed = null;
var isSerial = IsType(type, OfSerial);
var isEntity = IsType(type, OfEntity);
if (isSerial) // mutate into int32
if (isSerial || isEntity) // mutate into int32
{
type = OfInt;
}
@ -194,19 +195,33 @@ namespace Server
constructed = parsed;
return null;
}
return "Not a valid boolean string.";
}
if (value.StartsWithOrdinal("0x") && IsNumeric(type))
if (IsNumeric(type))
{
try
{
if (ulong.TryParse(value.AsSpan(2), NumberStyles.HexNumber, null, out var num))
var isHex = value.StartsWithOrdinal("0x");
var index = isHex ? 2 : 0;
if (ulong.TryParse(value.AsSpan(index), isHex ? NumberStyles.HexNumber : NumberStyles.Integer, null, out var num))
{
constructed = Convert.ChangeType(num, type);
if (isEntity)
{
constructed = World.FindEntity((Serial)num);
}
else if (isSerial)
{
constructed = (Serial)num;
}
else
{
constructed = Convert.ChangeType(num, type);
}
return null;
}
return null;
}
catch
{
@ -230,11 +245,6 @@ namespace Server
try
{
constructed = Convert.ChangeType(value, type);
if (isSerial) // mutate back
{
constructed = (Serial)(constructed ?? Serial.MinusOne);
}
return null;
}
catch