1 files changed, 2 insertions, 8 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 62ee55b903b..bf971cae32f 100755
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -374,17 +374,11 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
                 {
                     plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth());
                     // pl can be alive if GM/etc
+                    // change the death state to CORPSE to prevent the death timer from
+                    // starting in the next player update
                     if (!plMover->isAlive())
-                    {
-                        // change the death state to CORPSE to prevent the death timer from
-                        // starting in the next player update
                         plMover->KillPlayer();
-                        plMover->BuildPlayerRepop();
-                    }
                 }
-
-                // cancel the death timer here if started
-                plMover->RepopAtGraveyard();
             }
         }
     }