mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 05:07:47 +00:00
Code Activity

Fixed actor state property packet not sending in string correctly. Added test command for it. Fixed bug in MurmurHash algo.

Browse source
This commit is contained in:
Filip Maj 2015-11-28 10:00:18 -05:00
parent 0a6b005a0c
commit 50659afc82
4 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FFXIVClassic Map Server/Program.cs
View file

@ -20,7 +20,6 @@ namespace FFXIVClassic_Lobby_Server
TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out); TextWriterTraceListener myWriter = new TextWriterTraceListener(System.Console.Out);
Debug.Listeners.Add(myWriter); Debug.Listeners.Add(myWriter);
#endif #endif
bool startServer = true; bool startServer = true;
Console.ForegroundColor = ConsoleColor.Cyan; Console.ForegroundColor = ConsoleColor.Cyan;
@ -87,8 +86,11 @@ namespace FFXIVClassic_Lobby_Server
Log.error("Could not load packet"); Log.error("Could not load packet");
} }
} }
else if (split[0].Equals("property"))
{
server.testCodePacket(Utils.MurmurHash2(split[1], 0), Convert.ToUInt32(split[2], 16), split[3]);
}
} }
Thread.Sleep(1000);
} }
} }

25
FFXIVClassic Map Server/Server.cs
View file

@ -10,6 +10,7 @@ using FFXIVClassic_Lobby_Server.common;
using FFXIVClassic_Map_Server.dataobjects; using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Lobby_Server.packets; using FFXIVClassic_Lobby_Server.packets;
using System.IO; using System.IO;
using FFXIVClassic_Map_Server.packets.send.actor;
namespace FFXIVClassic_Lobby_Server namespace FFXIVClassic_Lobby_Server
{ {
@ -204,7 +205,14 @@ namespace FFXIVClassic_Lobby_Server
if (buffer.Length < offset + packetSize) if (buffer.Length < offset + packetSize)
return null; return null;
try
{
newPacket = new BasePacket(buffer, ref offset); newPacket = new BasePacket(buffer, ref offset);
}
catch (OverflowException)
{
return null;
}
return newPacket; return newPacket;
} }
@ -215,5 +223,22 @@ namespace FFXIVClassic_Lobby_Server
{ {
mProcessor.sendPacket(path, conn); mProcessor.sendPacket(path, conn);
} }
public void testCodePacket(uint id, uint value, string target)
{
SetActorPropetyPacket changeProperty = new SetActorPropetyPacket();
changeProperty.addInt(id, value);
changeProperty.setTarget(target);
foreach (KeyValuePair<uint, Player> entry in mConnectedPlayerList)
{
SubPacket changePropertyPacket = changeProperty.buildPacket((entry.Value.actorID), (entry.Value.actorID));
BasePacket packet = BasePacket.createPacket(changePropertyPacket, true, false);
packet.debugPrintPacket();
entry.Value.getConnection1().queuePacket(packet);
entry.Value.getConnection2().queuePacket(packet);
}
}
} }
} }

7
FFXIVClassic Map Server/common/Utils.cs
View file

@ -96,15 +96,14 @@ namespace FFXIVClassic_Lobby_Server.common
} }
// Handle the last few bytes of the input array // Handle the last few bytes of the input array
switch (len) switch (len)
{ {
case 3: case 3:
h ^= (uint)data[2] << 16; goto case 2; h ^= (uint)data[0] << 16; goto case 2;
case 2: case 2:
h ^= (uint)data[0] << 8; goto case 1; h ^= (uint)data[len-2] << 8; goto case 1;
case 1: case 1:
h ^= data[1]; h ^= data[len-1];
h *= m; h *= m;
break; break;
}; };

4
FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs
View file

@ -138,8 +138,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public void setTarget(string target) public void setTarget(string target)
{ {
binWriter.Write((byte)(0x82 + target.Length)); binWriter.Write((byte)(0x82 + target.Length));
binWriter.Write(target); binWriter.Write(Encoding.ASCII.GetBytes(target));
runningByteTotal += (ushort)(1 + target.Length); runningByteTotal += (ushort)(1 + Encoding.ASCII.GetByteCount(target));
} }