IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

convert alot of stuff to byte[] from MemoryStream.

Browse source
This commit is contained in:
Bluzume 2021-11-01 02:32:28 -04:00
parent 2ad5e231a9
commit db248c5962
9 changed files with 100 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/HorseIsleServer/Game/Items/Tack.cs
View file

@ -122,13 +122,13 @@ namespace HISP.Game.Items
try
{
TackSet set = GetSetByName(Converters.CapitalizeFirstLetter(itemInfo.EmbedSwf));
TackSet set = GetSetByName(Util.CapitalizeFirstLetter(itemInfo.EmbedSwf));
set.Add(itemInfo);
}
catch(KeyNotFoundException)
{
TackSet tackSet = new TackSet();
tackSet.SetName = Converters.CapitalizeFirstLetter(itemInfo.EmbedSwf);
tackSet.SetName = Util.CapitalizeFirstLetter(itemInfo.EmbedSwf);
tackSet.Add(itemInfo);
tackSets.Add(tackSet);
}

2
HorseIsleServer/HorseIsleServer/Game/Messages.cs
View file

@ -1445,7 +1445,7 @@ namespace HISP.Game
}
public static string FormatSocialMenuType(string type)
{
return SocialTypeFormat.Replace("%TYPE%", Converters.CapitalizeFirstLetter(type.ToLower()));
return SocialTypeFormat.Replace("%TYPE%", Util.CapitalizeFirstLetter(type.ToLower()));
}
// Trading

6
HorseIsleServer/HorseIsleServer/Game/Meta.cs
View file

@ -1259,7 +1259,7 @@ namespace HISP.Game
continue;
string username = Database.GetUsername(id);
int minutes = Convert.ToInt32(Math.Round(DateTime.UtcNow.Subtract(Converters.UnixTimeStampToDateTime(Database.GetPlayerLastLogin(id))).TotalMinutes));
int minutes = Convert.ToInt32(Math.Round(DateTime.UtcNow.Subtract(Util.UnixTimeStampToDateTime(Database.GetPlayerLastLogin(id))).TotalMinutes));
message += Messages.FormatOfflineBuddyEntry(username, id, minutes);
}
@ -2124,7 +2124,7 @@ namespace HISP.Game
}
public static string BuildMailLetter(Mailbox.Mail mailMessage, int itemRandomId)
{
DateTime time = Converters.UnixTimeStampToDateTime(mailMessage.Timestamp);
DateTime time = Util.UnixTimeStampToDateTime(mailMessage.Timestamp);
string amOrPm = "am";
string[] months = new string[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
string minutes = time.Minute.ToString();
@ -2596,7 +2596,7 @@ namespace HISP.Game
{
string message = Messages.FormatPawneerOrderSelectGender(color, breed.Name);
foreach (string gender in breed.GenderTypes())
message += Messages.FormatPawneerOrderGenderEntry(Converters.CapitalizeFirstLetter(gender), gender);
message += Messages.FormatPawneerOrderGenderEntry(Util.CapitalizeFirstLetter(gender), gender);
message += Messages.BackToMap;
message += Messages.MetaTerminator;
return message;

2
HorseIsleServer/HorseIsleServer/Game/Ranch.cs
View file

@ -134,7 +134,7 @@ namespace HISP.Game
return ownerId;
int subExp = Database.GetUserSubscriptionExpireDate(ownerId);
DateTime expTime = Converters.UnixTimeStampToDateTime(subExp);
DateTime expTime = Util.UnixTimeStampToDateTime(subExp);
if ((DateTime.UtcNow.Date - expTime.Date).Days >= 30)
{
int price = GetSellPrice();

2
HorseIsleServer/HorseIsleServer/Player/User.cs
View file

@ -246,7 +246,7 @@ namespace HISP.Player
{
get
{
return Converters.UnixTimeStampToDateTime(subscribedUntil);
return Util.UnixTimeStampToDateTime(subscribedUntil);
}
}
public int FreeMinutes

4
HorseIsleServer/HorseIsleServer/Server/Database.cs
View file

@ -3352,7 +3352,7 @@ namespace HISP.Server
sqlCommand.Prepare();
string expectedHash = sqlCommand.ExecuteScalar().ToString();
sqlCommand.Dispose();
return Converters.StringToByteArray(expectedHash);
return Util.StringToByteArray(expectedHash);
}
else
{
@ -6047,7 +6047,7 @@ namespace HISP.Server
string expectedHash = sqlCommand.ExecuteScalar().ToString();
sqlCommand.Dispose();
return Converters.StringToByteArray(expectedHash);
return Util.StringToByteArray(expectedHash);
}
else
{

2
HorseIsleServer/HorseIsleServer/Server/GameServer.cs
View file

@ -2818,7 +2818,7 @@ namespace HISP.Server
if(Transport.GetTransportLocation(tpPoint.Locations[0]).Type == "WAGON") // is wagon?
{
double distance = Converters.PointsToDistance(ranchX, ranchY, tpPoint.X, tpPoint.Y);
double distance = Util.PointsToDistance(ranchX, ranchY, tpPoint.X, tpPoint.Y);
if(distance < smallestDistance)
{
smallestDistance = distance;

186
HorseIsleServer/HorseIsleServer/Server/PacketBuilder.cs
View file

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Text;
@ -430,120 +431,106 @@ namespace HISP.Server
}
public static byte[] CreatePlayerInfoUpdateOrCreate(int x, int y, int facing, int charId, string username)
{
MemoryStream ms = new MemoryStream();
byte[] userBytes = Encoding.UTF8.GetBytes(username);
byte[] packet = new byte[(1 * 10) + userBytes.Length];
ms.WriteByte(PACKET_PLAYERINFO);
ms.WriteByte(PLAYERINFO_UPDATE_OR_CREATE);
packet[0] = PACKET_PLAYERINFO;
packet[1] = PLAYERINFO_UPDATE_OR_CREATE;
ms.WriteByte((byte)(((x - 4) / 64) + 20));
ms.WriteByte((byte)(((x - 4) % 64) + 20));
packet[2] = (byte)(((x - 4) / 64) + 20);
packet[3] = (byte)(((x - 4) % 64) + 20);
ms.WriteByte((byte)(((y - 1) / 64) + 20));
ms.WriteByte((byte)(((y - 1) % 64) + 20));
packet[4] = (byte)(((y - 1) / 64) + 20);
packet[5] = (byte)(((y - 1) % 64) + 20);
ms.WriteByte((byte)(facing + 20));
packet[6] = (byte)(facing + 20);
ms.WriteByte((byte)((charId / 64) + 20)); //6
ms.WriteByte((byte)((charId % 64) + 20)); //7
packet[7] = (byte)((charId / 64) + 20);
packet[8] = (byte)((charId % 64) + 20);
Array.Copy(userBytes, 0, packet, 9, userBytes.Length);
byte[] strBytes = Encoding.UTF8.GetBytes(username);
ms.Write(strBytes, 0x00, strBytes.Length);
packet[packet.Length] = PACKET_TERMINATOR;
ms.WriteByte(PACKET_TERMINATOR);
ms.Seek(0x00, SeekOrigin.Begin);
byte[] Packet = ms.ToArray();
ms.Dispose();
return Packet;
return packet;
}
public static byte[] CreateLoginPacket(bool Success, string message="")
{
MemoryStream ms = new MemoryStream();
ms.WriteByte(PACKET_LOGIN);
if (message != "")
ms.WriteByte(LOGIN_CUSTOM_MESSAGE);
else if (Success)
ms.WriteByte(LOGIN_SUCCESS);
else
ms.WriteByte(LOGIN_INVALID_USER_PASS);
byte[] loginFailMessage = Encoding.UTF8.GetBytes(message);
ms.Write(loginFailMessage, 0x00, loginFailMessage.Length);
byte[] packet = new byte[(1 * 3) + loginFailMessage.Length];
ms.WriteByte(PACKET_TERMINATOR);
packet[0] = PACKET_LOGIN;
if (message != "")
packet[1] = LOGIN_CUSTOM_MESSAGE;
else if (Success)
packet[1] = LOGIN_SUCCESS;
else
packet[1] = LOGIN_INVALID_USER_PASS;
ms.Seek(0x00, SeekOrigin.Begin);
byte[] Packet = ms.ToArray();
ms.Dispose();
Array.Copy(loginFailMessage, 0, packet, 2, loginFailMessage.Length);
return Packet;
packet[packet.Length] = PACKET_TERMINATOR;
return packet;
}
public static byte[] CreateProfilePacket(string userProfile)
{
MemoryStream ms = new MemoryStream();
byte[] profileBytes = Encoding.UTF8.GetBytes(userProfile);
byte[] packet = new byte[(1 * 2) + profileBytes.Length];
ms.WriteByte(PACKET_PLAYER);
packet[0] = PACKET_PLAYER;
Array.Copy(profileBytes, 0, packet, 1, profileBytes.Length);
packet[packet.Length] = PACKET_TERMINATOR;
byte[] strBytes = Encoding.UTF8.GetBytes(userProfile);
ms.Write(strBytes, 0x00, strBytes.Length);
ms.WriteByte(PACKET_TERMINATOR);
ms.Seek(0x00, SeekOrigin.Begin);
byte[] Packet = ms.ToArray();
ms.Dispose();
return Packet;
return packet;
}
public static byte[] CreateHorseRidePacket(int x, int y, int charId, int facing, int direction, bool walk)
{
// Header information
MemoryStream ms = new MemoryStream();
ms.WriteByte(PACKET_MOVE);
byte[] packet = new byte[(1 * 10)];
packet[0] = PACKET_MOVE;
ms.WriteByte((byte)(((x - 4) / 64) + 20)); //1
ms.WriteByte((byte)(((x - 4) % 64) + 20)); //2
packet[1] = (byte)(((x - 4) / 64) + 20);
packet[2] = (byte)(((x - 4) % 64) + 20);
ms.WriteByte((byte)(((y - 1) / 64) + 20)); //3
ms.WriteByte((byte)(((y - 1) % 64) + 20)); //4
packet[3] = (byte)(((y - 1) / 64) + 20);
packet[4] = (byte)(((y - 1) % 64) + 20);
ms.WriteByte((byte)(facing + 20)); //5
packet[5] = (byte)(facing + 20);
ms.WriteByte((byte)((charId / 64) + 20)); //6
ms.WriteByte((byte)((charId % 64) + 20)); //7
packet[6] = (byte)((charId / 64) + 20);
packet[7] = (byte)((charId % 64) + 20);
ms.WriteByte((byte)(direction + 20)); //8
packet[8] = (byte)(direction + 20);
ms.WriteByte((byte)(Convert.ToInt32(walk) + 20)); //9\
ms.WriteByte(PACKET_TERMINATOR);
ms.Seek(0x00, SeekOrigin.Begin);
byte[] packetData = ms.ToArray();
ms.Dispose();
return packetData;
packet[9] = (byte)(Convert.ToInt32(walk) + 20);
packet[packet.Length] = PACKET_TERMINATOR;
return packet;
}
public static byte[] CreateMovementPacket(int x, int y,int charId,int facing, int direction, bool walk)
public static byte[] CreateMovementPacket(int x, int y, int charId, int facing, int direction, bool walk)
{
// Header information
MemoryStream ms = new MemoryStream();
ms.WriteByte(PACKET_MOVE);
List<byte> packet = new List<byte>();
ms.WriteByte((byte)(((x-4) / 64) + 20)); //1
ms.WriteByte((byte)(((x-4) % 64) + 20)); //2
packet.Add(PACKET_MOVE);
ms.WriteByte((byte)(((y-1) / 64) + 20)); //3
ms.WriteByte((byte)(((y-1) % 64) + 20)); //4
packet.Add((byte)(((x-4) / 64) + 20)); //1
packet.Add((byte)(((x-4) % 64) + 20)); //2
ms.WriteByte((byte)(facing + 20)); //5
packet.Add((byte)(((y-1) / 64) + 20)); //3
packet.Add((byte)(((y-1) % 64) + 20)); //4
ms.WriteByte((byte)((charId / 64) + 20)); //6
ms.WriteByte((byte)((charId % 64) + 20)); //7
ms.WriteByte((byte)(direction + 20)); //8
ms.WriteByte((byte)(Convert.ToInt32(walk) + 20)); //9
packet.Add((byte)(facing + 20)); //5
packet.Add((byte)((charId / 64) + 20)); //6
packet.Add((byte)((charId % 64) + 20)); //7
packet.Add((byte)(direction + 20)); //8
packet.Add((byte)(Convert.ToInt32(walk) + 20)); //9
// Map Data
@ -577,19 +564,17 @@ namespace HISP.Server
if (tileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
tileId -= 100;
}
ms.WriteByte((byte)tileId);
packet.Add((byte)tileId);
if (otileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
otileId -= 100;
}
ms.WriteByte((byte)otileId);
packet.Add((byte)otileId);
}
}
}
@ -614,19 +599,17 @@ namespace HISP.Server
if (tileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
tileId -= 100;
}
ms.WriteByte((byte)tileId);
packet.Add((byte)tileId);
if (otileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
otileId -= 100;
}
ms.WriteByte((byte)otileId);
packet.Add((byte)otileId);
}
}
}
@ -652,17 +635,17 @@ namespace HISP.Server
if (tileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
tileId -= 100;
}
ms.WriteByte((byte)tileId);
packet.Add((byte)tileId);
if (otileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
otileId -= 100;
}
ms.WriteByte((byte)otileId);
packet.Add((byte)otileId);
}
}
@ -688,17 +671,17 @@ namespace HISP.Server
if (tileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
tileId -= 100;
}
ms.WriteByte((byte)tileId);
packet.Add((byte)tileId);
if (otileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
otileId -= 100;
}
ms.WriteByte((byte)otileId);
packet.Add((byte)otileId);
}
}
@ -715,30 +698,25 @@ namespace HISP.Server
if(tileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
tileId -= 100;
}
ms.WriteByte((byte)tileId);
packet.Add((byte)tileId);
if (otileId >= 190)
{
ms.WriteByte((byte)190);
packet.Add((byte)190);
otileId -= 100;
}
ms.WriteByte((byte)otileId);
packet.Add((byte)otileId);
}
}
}
packet.Add(PACKET_TERMINATOR);
ms.WriteByte(PACKET_TERMINATOR);
ms.Seek(0x00, SeekOrigin.Begin);
byte[] Packet = ms.ToArray();
ms.Dispose();
return Packet;
return packet.ToArray();
}
public static byte[] CreateClickTileInfoPacket(string text)

10
HorseIsleServer/HorseIsleServer/Server/Converters.cs → HorseIsleServer/HorseIsleServer/Server/Util.cs
View file

@ -1,9 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace HISP.Server
{
public class Converters
public class Util
{
// Thanks Stackoverflow (https://stackoverflow.com/questions/321370/how-can-i-convert-a-hex-string-to-a-byte-array)
private static int getHexVal(char hex)
@ -45,6 +46,9 @@ namespace HISP.Server
return dtDateTime;
}
public static void ByteArrayToByteList(byte[] byteArray, List<byte> byteList)
{
byteList.AddRange(byteArray.ToList());
}
}
}