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

Rearranges packet code (#295)

Browse source
This commit is contained in:
Kamron Batman 2020-10-30 22:49:00 -07:00 • committed by GitHub
parent 5f7e4bf050
commit a8d486a969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 3023 additions and 2846 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Accounting/AccountAttackLimiter.cs
View file

@ -24,9 +24,9 @@ namespace Server.Accounting
return;
}
PacketHandlers.RegisterThrottler(0x80, Throttle_Callback);
PacketHandlers.RegisterThrottler(0x91, Throttle_Callback);
PacketHandlers.RegisterThrottler(0xCF, Throttle_Callback);
IncomingPackets.RegisterThrottler(0x80, Throttle_Callback);
IncomingPackets.RegisterThrottler(0x91, Throttle_Callback);
IncomingPackets.RegisterThrottler(0xCF, Throttle_Callback);
}
public static TimeSpan Throttle_Callback(NetState ns)

6
Projects/UOContent/Accounting/AccountHandler.cs
View file

@ -256,13 +256,13 @@ namespace Server.Misc
acct.Comments.Add(new AccountComment("System", $"Character #{index + 1} {m} deleted by {state}"));
m.Delete();
Packets.SendCharacterListUpdate(state, acct);
state.SendCharacterListUpdate(acct);
return;
}
}
Packets.SendCharacterDeleteResult(state, res);
Packets.SendCharacterListUpdate(state, acct);
state.SendCharacterDeleteResult(res);
state.SendCharacterListUpdate(acct);
}

2
Projects/UOContent/Configuration/ExpansionConfiguration.cs
View file

@ -30,7 +30,7 @@ namespace Server
if (ObjectPropertyList.Enabled)
{
PacketHandlers.SingleClickProps =
IncomingEntityPackets.SingleClickProps =
true; // single click for everything is overridden to check object property list
}

4
Projects/UOContent/Engines/Chat/Chat.cs
View file

@ -14,8 +14,8 @@ namespace Server.Engines.Chat
public static void Initialize()
{
PacketHandlers.Register(0xB5, 0x40, true, OpenChatWindowRequest);
PacketHandlers.Register(0xB3, 0, true, ChatAction);
IncomingPackets.Register(0xB5, 0x40, true, OpenChatWindowRequest);
IncomingPackets.Register(0xB3, 0, true, ChatAction);
}
public static void SendCommandTo(Mobile to, ChatCommand type, string param1 = null, string param2 = null)

6
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -376,21 +376,21 @@ namespace Server.Engines.ConPVP
int climb = count / 2;
if (climb > 3)
climb = 3;
for ( i = 0; i < climb; i++ )
{
p = ((Point3D)list[i]);
p.Z += (i+1) * 4;
list[i] = p;
}
for ( ; i < count - climb; i++ )
{
p = ((Point3D)list[i]);
p.Z += 16;
list[i] = p;
}
for ( i = climb; i > 0; i-- )
{
p = ((Point3D)list[i]);

2
Projects/UOContent/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -80,7 +80,7 @@ namespace Server.Engines.MLQuests.Gumps
{
m_Pending = new Dictionary<NetState, RaceChangeState>();
PacketHandlers.RegisterExtended(0x2A, true, RaceChangeReply);
IncomingExtendedCommandPackets.RegisterExtended(0x2A, true, RaceChangeReply);
}
public static bool IsPending(NetState state) => state != null && m_Pending.ContainsKey(state);

6
Projects/UOContent/Items/Books/BaseBook.cs
View file

@ -361,9 +361,9 @@ namespace Server.Items
public static void Initialize()
{
PacketHandlers.Register(0xD4, 0, true, HeaderChange);
PacketHandlers.Register(0x66, 0, true, ContentChange);
PacketHandlers.Register(0x93, 99, true, OldHeaderChange);
IncomingPackets.Register(0xD4, 0, true, HeaderChange);
IncomingPackets.Register(0x66, 0, true, ContentChange);
IncomingPackets.Register(0x93, 99, true, OldHeaderChange);
}
public static void OldHeaderChange(NetState state, CircularBufferReader reader)

2
Projects/UOContent/Items/Games/Mahjong/MahjongPacketHandlers.cs
View file

@ -25,7 +25,7 @@ namespace Server.Engines.Mahjong
public static void Initialize()
{
PacketHandlers.Register(0xDA, 0, true, OnPacket);
IncomingPackets.Register(0xDA, 0, true, OnPacket);
RegisterSubCommand(0x6, ExitGame);
RegisterSubCommand(0xA, GivePoints);

2
Projects/UOContent/Items/Maps/MapItem.cs
View file

@ -331,7 +331,7 @@ namespace Server.Items
public static void Initialize()
{
PacketHandlers.Register(0x56, 11, true, OnMapCommand);
IncomingPackets.Register(0x56, 11, true, OnMapCommand);
}
private static void OnMapCommand(NetState state, CircularBufferReader reader)

2
Projects/UOContent/Items/Misc/BulletinBoards.cs
View file

@ -229,7 +229,7 @@ namespace Server.Items
public static void Initialize()
{
PacketHandlers.Register(0x71, 0, true, BBClientRequest);
IncomingPackets.Register(0x71, 0, true, BBClientRequest);
}
public static void BBClientRequest(NetState state, CircularBufferReader reader)

4
Projects/UOContent/Items/Shields/BaseShield.cs
View file

@ -142,9 +142,9 @@ namespace Server.Items
/*
FORMULA: Displayed AR = ((Parrying Skill * Base AR of Shield) <EFBFBD> 200) + 1
FORMULA: % Chance of Blocking = parry skill - (shieldAR * 2)
FORMULA: Melee Damage Absorbed = (AR of Shield) / 2 | Archery Damage Absorbed = AR of Shield
*/
if (owner.CheckSkill(SkillName.Parry, chance))

2
Projects/UOContent/Misc/HardwareInfo.cs
View file

@ -89,7 +89,7 @@ namespace Server
public static void Initialize()
{
PacketHandlers.Register(0xD9, 0x10C, false, OnReceive);
IncomingPackets.Register(0xD9, 0x10C, false, OnReceive);
CommandSystem.Register("HWInfo", AccessLevel.GameMaster, HWInfo_OnCommand);
}

2
Projects/UOContent/Misc/ProtocolExtensions.cs
View file

@ -8,7 +8,7 @@ namespace Server.Misc
public static void Initialize()
{
PacketHandlers.Register(0xF0, 0, false, DecodeBundledPacket);
IncomingPackets.Register(0xF0, 0, false, DecodeBundledPacket);
}
public static void Register(int packetID, bool ingame, OnPacketReceive onReceive)

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

@ -1015,7 +1015,7 @@ namespace Server.Mobiles
{
if (FastwalkPrevention)
{
PacketHandlers.RegisterThrottler(0x02, MovementThrottle_Callback);
IncomingPackets.RegisterThrottler(0x02, MovementThrottle_Callback);
}
EventSink.Login += OnLogin;

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

@ -975,23 +975,23 @@ namespace Server.Multis
public static void Initialize()
{
PacketHandlers.RegisterExtended(0x1E, true, QueryDesignDetails);
IncomingExtendedCommandPackets.RegisterExtended(0x1E, true, QueryDesignDetails);
PacketHandlers.RegisterEncoded(0x02, true, Designer_Backup);
PacketHandlers.RegisterEncoded(0x03, true, Designer_Restore);
PacketHandlers.RegisterEncoded(0x04, true, Designer_Commit);
PacketHandlers.RegisterEncoded(0x05, true, Designer_Delete);
PacketHandlers.RegisterEncoded(0x06, true, Designer_Build);
PacketHandlers.RegisterEncoded(0x0C, true, Designer_Close);
PacketHandlers.RegisterEncoded(0x0D, true, Designer_Stairs);
PacketHandlers.RegisterEncoded(0x0E, true, Designer_Sync);
PacketHandlers.RegisterEncoded(0x10, true, Designer_Clear);
PacketHandlers.RegisterEncoded(0x12, true, Designer_Level);
IncomingPackets.RegisterEncoded(0x02, true, Designer_Backup);
IncomingPackets.RegisterEncoded(0x03, true, Designer_Restore);
IncomingPackets.RegisterEncoded(0x04, true, Designer_Commit);
IncomingPackets.RegisterEncoded(0x05, true, Designer_Delete);
IncomingPackets.RegisterEncoded(0x06, true, Designer_Build);
IncomingPackets.RegisterEncoded(0x0C, true, Designer_Close);
IncomingPackets.RegisterEncoded(0x0D, true, Designer_Stairs);
IncomingPackets.RegisterEncoded(0x0E, true, Designer_Sync);
IncomingPackets.RegisterEncoded(0x10, true, Designer_Clear);
IncomingPackets.RegisterEncoded(0x12, true, Designer_Level);
PacketHandlers.RegisterEncoded(0x13, true, Designer_Roof); // Samurai Empire roof
PacketHandlers.RegisterEncoded(0x14, true, Designer_RoofDelete); // Samurai Empire roof
IncomingPackets.RegisterEncoded(0x13, true, Designer_Roof); // Samurai Empire roof
IncomingPackets.RegisterEncoded(0x14, true, Designer_RoofDelete); // Samurai Empire roof
PacketHandlers.RegisterEncoded(0x1A, true, Designer_Revert);
IncomingPackets.RegisterEncoded(0x1A, true, Designer_Revert);
EventSink.Speech += EventSink_Speech;
}