cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

Browse Source 
# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
This commit is contained in:
Tahir Akhlaq
2016-06-14 22:54:02 +01:00
parent 24f55139dd f5619ff800
commit 335a59204c
521 changed files with 12848 additions and 10394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FFXIVClassic Map Server/Database.cs
View File

@@ -400,7 +400,6 @@ namespace FFXIVClassic_Map_Server
birthMonth,
initialTown,
tribe,
currentParty,
restBonus,
achievementPoints,
playTime
@@ -430,9 +429,9 @@ namespace FFXIVClassic_Map_Server
player.playerWork.birthdayMonth = reader.GetByte(14);
player.playerWork.initialTown = reader.GetByte(15);
player.playerWork.tribe = reader.GetByte(16);
player.playerWork.restBonusExpRate = reader.GetInt32(18);
player.achievementPoints = reader.GetUInt32(19);
player.playTime = reader.GetUInt32(20);
player.playerWork.restBonusExpRate = reader.GetInt32(17);
player.achievementPoints = reader.GetUInt32(18);
player.playTime = reader.GetUInt32(19);
}
}