mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed one more forgotten merge conflict

Browse source
This commit is contained in:
sanctum32 2015-02-03 17:01:55 +00:00 • committed by Antz
parent dcac66fdfe
commit ec3b4e101f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Object/Player.cpp
View file

@ -4608,7 +4608,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
RemoveAurasDueToSpell(20584); // speed bonuses RemoveAurasDueToSpell(20584); // speed bonuses
RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST
SetDeathState(ALIVE); SetDeathState(ALIVE);
SetWaterWalk(false); SetWaterWalk(false);
SetRoot(false); SetRoot(false);
@ -15665,7 +15665,7 @@ void Player::_LoadIntoDataField(const char* data, uint32 startOffset, uint32 cou
bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder) bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder)
{ {
// 0 1 2 3 4 5 6 7 8 9 10 11 // 0 1 2 3 4 5 6 7 8 9 10 11
// SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags," // SELECT guid, account, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags,"
// 12 13 14 15 16 17 18 19 20 21 22 23 24 // 12 13 14 15 16 17 18 19 20 21 22 23 24
//"position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost," //"position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost,"