aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXanadu <none@none>2010-03-17 20:34:02 +0100
committerXanadu <none@none>2010-03-17 20:34:02 +0100
commit48d7ae707db2a4997663e368e8afe1ae853c7d18 (patch)
treec92867a56535c7644884d4bbf1e9b9921082e172
parenta73b9b0f1ec557ac3fa4acf34f774996f4aa1369 (diff)
Fixed players not being able to resurrect after core crash.
--HG-- branch : trunk
-rw-r--r--src/game/Corpse.cpp2
-rw-r--r--src/game/ObjectMgr.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp
index 5272c5209df..e3dd399a032 100644
--- a/src/game/Corpse.cpp
+++ b/src/game/Corpse.cpp
@@ -185,8 +185,6 @@ bool Corpse::LoadFromDB(uint32 guid, QueryResult *result, uint32 InstanceId)
bool Corpse::LoadFromDB(uint32 guid, Field *fields)
{
- // 0 1 2 3 4 5 6 7 8 9
- //result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,data,time,corpse_type,instance,phaseMask FROM corpse WHERE guid = '%u'",guid);
float positionX = fields[0].GetFloat();
float positionY = fields[1].GetFloat();
float positionZ = fields[2].GetFloat();
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index d7970980cb9..f9f00d57120 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -6578,8 +6578,8 @@ uint32 ObjectMgr::GeneratePetNumber()
void ObjectMgr::LoadCorpses()
{
uint32 count = 0;
- // 0 1 2 3 4 5 6 7 8 10
- QueryResult_AutoPtr result = CharacterDatabase.Query("SELECT position_x, position_y, position_z, orientation, map, data, time, corpse_type, instance, guid FROM corpse WHERE corpse_type <> 0");
+ // 0 1 2 3 4 5 6 7 8 9 10
+ QueryResult_AutoPtr result = CharacterDatabase.Query("SELECT position_x, position_y, position_z, orientation, map, data, time, corpse_type, instance, phaseMask, guid FROM corpse WHERE corpse_type <> 0");
if(!result)
{