Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some Cleanups

Browse Source
This commit is contained in:
hondacrx
2021-06-07 18:06:16 -04:00
parent cb7640e3c6
commit 302a1f293c
53 changed files with 382 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Networking/PacketLog.cs
+31 -35
View File
@@ -34,18 +34,16 @@ public class PacketLog
if (!string.IsNullOrEmpty(logname))
{
FullPath = logsDir + @"\" + logname;
using (var writer = new BinaryWriter(File.Open(FullPath, FileMode.Create)))
{
writer.Write(Encoding.ASCII.GetBytes("PKT"));
writer.Write((ushort)769);
writer.Write(Encoding.ASCII.GetBytes("T"));
writer.Write(Global.WorldMgr.GetRealm().Build);
writer.Write(Encoding.ASCII.GetBytes("enUS"));
writer.Write(new byte[40]);//SessionKey
writer.Write((uint)GameTime.GetGameTime());
writer.Write(Time.GetMSTime());
writer.Write(0);
}
using var writer = new BinaryWriter(File.Open(FullPath, FileMode.Create));
writer.Write(Encoding.ASCII.GetBytes("PKT"));
writer.Write((ushort)769);
writer.Write(Encoding.ASCII.GetBytes("T"));
writer.Write(Global.WorldMgr.GetRealm().Build);
writer.Write(Encoding.ASCII.GetBytes("enUS"));
writer.Write(new byte[40]);//SessionKey
writer.Write((uint)GameTime.GetGameTime());
writer.Write(Time.GetMSTime());
writer.Write(0);
}
}
@@ -56,33 +54,31 @@ public class PacketLog
lock (syncObj)
{
using (var writer = new BinaryWriter(File.Open(FullPath, FileMode.Append), Encoding.ASCII))
{
writer.Write(isClientPacket ? 0x47534d43 : 0x47534d53);
writer.Write((uint)connectionType);
writer.Write(Time.GetMSTime());
using var writer = new BinaryWriter(File.Open(FullPath, FileMode.Append), Encoding.ASCII);
writer.Write(isClientPacket ? 0x47534d43 : 0x47534d53);
writer.Write((uint)connectionType);
writer.Write(Time.GetMSTime());
writer.Write(20);
byte[] SocketIPBytes = new byte[16];
if (endPoint.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
Buffer.BlockCopy(endPoint.Address.GetAddressBytes(), 0, SocketIPBytes, 0, 4);
else
Buffer.BlockCopy(endPoint.Address.GetAddressBytes(), 0, SocketIPBytes, 0, 16);
writer.Write(20);
byte[] SocketIPBytes = new byte[16];
if (endPoint.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
Buffer.BlockCopy(endPoint.Address.GetAddressBytes(), 0, SocketIPBytes, 0, 4);
else
Buffer.BlockCopy(endPoint.Address.GetAddressBytes(), 0, SocketIPBytes, 0, 16);
int size = data.Length;
if (isClientPacket)
size -= 2;
int size = data.Length;
if (isClientPacket)
size -= 2;
writer.Write(size + 4);
writer.Write(SocketIPBytes);
writer.Write(endPoint.Port);
writer.Write(opcode);
writer.Write(size + 4);
writer.Write(SocketIPBytes);
writer.Write(endPoint.Port);
writer.Write(opcode);
if (isClientPacket)
writer.Write(data, 2, size);
else
writer.Write(data, 0, size);
}
if (isClientPacket)
writer.Write(data, 2, size);
else
writer.Write(data, 0, size);
}
}
Source/Game/Networking/PacketManager.cs
+4 -6
View File
@@ -133,12 +133,10 @@ namespace Game.Networking
if (packetType == null)
return;
using (var clientPacket = (ClientPacket)Activator.CreateInstance(packetType, packet))
{
clientPacket.Read();
clientPacket.LogPacket(session);
methodCaller(session, clientPacket);
}
using var clientPacket = (ClientPacket)Activator.CreateInstance(packetType, packet);
clientPacket.Read();
clientPacket.LogPacket(session);
methodCaller(session, clientPacket);
}
static Action<WorldSession, ClientPacket> CreateDelegate<P1>(MethodInfo method) where P1 : ClientPacket
Source/Game/Networking/Packets/MiscPackets.cs
+2 -2
View File
@@ -250,7 +250,7 @@ namespace Game.Networking.Packets
violenceLevel = _worldPacket.ReadInt8();
}
sbyte violenceLevel = -1; // 0 - no combat effects, 1 - display some combat effects, 2 - blood, 3 - bloody, 4 - bloodier, 5 - bloodiest
public sbyte violenceLevel; // 0 - no combat effects, 1 - display some combat effects, 2 - blood, 3 - bloody, 4 - bloodier, 5 - bloodiest
}
public class TimeSyncRequest : ServerPacket
@@ -1155,7 +1155,7 @@ namespace Game.Networking.Packets
public bool IsFullUpdate;
public Dictionary<uint, HeirloomData> Heirlooms = new();
int Unk;
public int Unk;
}
class MountSpecial : ClientPacket
Source/Game/Networking/Packets/SpellPackets.cs
+3 -3
View File
@@ -56,8 +56,8 @@ namespace Game.Networking.Packets
Reason = _worldPacket.ReadInt32();
}
int ChannelSpell;
int Reason = 0; // 40 = /run SpellStopCasting(), 16 = movement/AURA_INTERRUPT_FLAG_MOVE, 41 = turning/AURA_INTERRUPT_FLAG_TURNING
public int ChannelSpell;
public int Reason; // 40 = /run SpellStopCasting(), 16 = movement/AURA_INTERRUPT_FLAG_MOVE, 41 = turning/AURA_INTERRUPT_FLAG_TURNING
// does not match SpellCastResult enum
}
@@ -1448,7 +1448,7 @@ namespace Game.Networking.Packets
public Optional<int> Duration;
public Optional<int> Remaining;
Optional<float> TimeMod;
public float[] Points = new float[0];
public float[] Points = Array.Empty<float>();
public List<float> EstimatedPoints = new();
}
Source/Game/Networking/WorldSocket.cs
+1 -1
View File
@@ -63,7 +63,7 @@ namespace Game.Networking
public WorldSocket(Socket socket) : base(socket)
{
_connectType = ConnectionType.Realm;
_serverChallenge = new byte[0].GenerateRandomKey(16);
_serverChallenge = Array.Empty<byte>().GenerateRandomKey(16);
_worldCrypt = new WorldCrypt();
_encryptKey = new byte[16];