diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 337cf66c..bea2e63b 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1062,7 +1062,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
             downed = false;
             SetHP(0.0f);
             KillMgr::Instance()->OnHumanDead(this, &info);
-            room->frame_event.AddDead(GetWeakPtrRef(), MetaMgr::Instance()->revive_time);
+            room->frame_event.AddDead(GetWeakPtrRef(), 1000 * 60);
         } else  {
             GetTrigger()->Die();
             dead = true;
@@ -1083,7 +1083,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, i
         return;
     }
     #ifdef DEBUG
-    #if 1
+    #if 0
     if (IsPlayer()) {
         return;
     }
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 68af18f4..07c8fd79 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -44,6 +44,7 @@ void Player::Initialize()
         SetInfiniteBulletMode();
     }
 #ifdef DEBUG
+    #if 0
     room->xtimer.AddDeadLineTimerAndAttach
         (SERVER_FRAME_RATE * 10,
          a8::XParams()
@@ -54,6 +55,7 @@ void Player::Initialize()
              hum->SetHP(hum->GetHP() - 100);
          },
          &xtimer_attacher.timer_list_);
+    #endif
 #endif
 }
 
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 7a406ef0..dfb9a090 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -935,7 +935,7 @@ Human* Room::GetWatchWarTarget(Human* hum)
 
 bool Room::BattleStarted()
 {
-    return battle_start_frameno_ != 0;
+    return battle_start_frameno_ != 0 || IsPveRoom();
 }
 
 int Room::GetAliveTeamNum()