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

Fixed some errors from the previous changes.

Browse source
This commit is contained in:
Filip Maj 2018-10-20 12:31:24 -04:00
parent 07c467e1af
commit 42aa3d7512
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
FFXIVClassic Lobby Server/Database.cs
View file

@ -388,7 +388,7 @@ namespace FFXIVClassic_Lobby_Server
address = reader.GetString("address"); address = reader.GetString("address");
port = reader.GetUInt16("port"); port = reader.GetUInt16("port");
listPosition = reader.GetUInt16("listPosition"); listPosition = reader.GetUInt16("listPosition");
population = reader.GetUInt16("population"); population = 2;
name = reader.GetString("name"); name = reader.GetString("name");
isActive = reader.GetBoolean("isActive"); isActive = reader.GetBoolean("isActive");
@ -440,7 +440,7 @@ namespace FFXIVClassic_Lobby_Server
address = reader.GetString("address"); address = reader.GetString("address");
port = reader.GetUInt16("port"); port = reader.GetUInt16("port");
listPosition = reader.GetUInt16("listPosition"); listPosition = reader.GetUInt16("listPosition");
population = reader.GetUInt16("population"); population = 2; //TODO
name = reader.GetString("name"); name = reader.GetString("name");
isActive = reader.GetBoolean("isActive"); isActive = reader.GetBoolean("isActive");
@ -588,7 +588,7 @@ namespace FFXIVClassic_Lobby_Server
public static Appearance GetAppearance(uint charaId) public static Appearance GetAppearance(uint charaId)
{ {
Appearance appearance = null; Appearance appearance = new Appearance();
using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (var conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
{ {
try try
@ -637,11 +637,11 @@ namespace FFXIVClassic_Lobby_Server
{ {
appearance.size = reader.GetByte("size"); appearance.size = reader.GetByte("size");
appearance.voice = reader.GetByte("voice"); appearance.voice = reader.GetByte("voice");
appearance.skinColor = reader.GetByte("skinColor"); appearance.skinColor = reader.GetUInt16("skinColor");
appearance.hairStyle = reader.GetByte("hairStyle"); appearance.hairStyle = reader.GetUInt16("hairStyle");
appearance.hairColor = reader.GetByte("hairColor"); appearance.hairColor = reader.GetUInt16("hairColor");
appearance.hairHighlightColor = reader.GetByte("hairHighlightColor"); appearance.hairHighlightColor = reader.GetUInt16("hairHighlightColor");
appearance.eyeColor = reader.GetByte("eyeColor"); appearance.eyeColor = reader.GetUInt16("eyeColor");
appearance.characteristics = reader.GetByte("characteristics"); appearance.characteristics = reader.GetByte("characteristics");
appearance.characteristicsColor = reader.GetByte("characteristicsColor"); appearance.characteristicsColor = reader.GetByte("characteristicsColor");
appearance.faceType = reader.GetByte("faceType"); appearance.faceType = reader.GetByte("faceType");
@ -653,19 +653,19 @@ namespace FFXIVClassic_Lobby_Server
appearance.faceIrisSize = reader.GetByte("faceIrisSize"); appearance.faceIrisSize = reader.GetByte("faceIrisSize");
appearance.faceEyebrows = reader.GetByte("faceEyebrows"); appearance.faceEyebrows = reader.GetByte("faceEyebrows");
appearance.mainHand = reader.GetByte("mainHand"); appearance.mainHand = reader.GetUInt32("mainHand");
appearance.offHand = reader.GetByte("offHand"); appearance.offHand = reader.GetUInt32("offHand");
appearance.head = reader.GetByte("head"); appearance.head = reader.GetUInt32("head");
appearance.body = reader.GetByte("body"); appearance.body = reader.GetUInt32("body");
appearance.mainHand = reader.GetByte("mainHand"); appearance.mainHand = reader.GetUInt32("mainHand");
appearance.legs = reader.GetByte("legs"); appearance.legs = reader.GetUInt32("legs");
appearance.hands = reader.GetByte("hands"); appearance.hands = reader.GetUInt32("hands");
appearance.feet = reader.GetByte("feet"); appearance.feet = reader.GetUInt32("feet");
appearance.waist = reader.GetByte("waist"); appearance.waist = reader.GetUInt32("waist");
appearance.leftFinger = reader.GetByte("leftFinger"); appearance.leftFinger = reader.GetUInt32("leftFinger");
appearance.rightFinger = reader.GetByte("rightFinger"); appearance.rightFinger = reader.GetUInt32("rightFinger");
appearance.leftEar = reader.GetByte("leftEar"); appearance.leftEar = reader.GetUInt32("leftEar");
appearance.rightEar = reader.GetByte("rightEar"); appearance.rightEar = reader.GetUInt32("rightEar");
} }
} }