Index: src/server/gem.cpp =================================================================== --- src/server/gem.cpp (revision 5622) +++ src/server/gem.cpp (working copy) @@ -2376,6 +2376,10 @@ // Death takes some special work if (fabs(hp) < 0.0005f || GetMode() == PSCHARACTER_MODE_DEFEATED) // check for dead { + // for now, if the actor is on a mount, he's dropped off it + if(GetMount()) + EntityManager::GetSingleton().RemoveRideRelation(this); + // If no explicit killer, look for the last person to cast a DoT spell. if (!attacker && dmgHistory.GetSize() > 0) { @@ -2416,10 +2420,6 @@ { psserver->combatmanager->StopAttack(attacker); } - - // for now, if the actor is on a mount, he's dropped off it - if(GetMount()) - EntityManager::GetSingleton().RemoveRideRelation(this); MulticastDRUpdate(); }