From ec3b4e101f0c301e17e0c56be9f530ca9508b6e1 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Tue, 3 Feb 2015 17:01:55 +0000 Subject: [PATCH] fixed one more forgotten merge conflict --- src/game/Object/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp index 48328d969..70c7ea8da 100644 --- a/src/game/Object/Player.cpp +++ b/src/game/Object/Player.cpp @@ -4608,7 +4608,7 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) RemoveAurasDueToSpell(20584); // speed bonuses RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST - SetDeathState(ALIVE); + SetDeathState(ALIVE); SetWaterWalk(false); SetRoot(false); @@ -15665,7 +15665,7 @@ void Player::_LoadIntoDataField(const char* data, uint32 startOffset, uint32 cou 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," // 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,"