From b59323e9751b3f723a7e19e4c4f329f3011747a5 Mon Sep 17 00:00:00 2001
From: zergtmn <zerg@myisp.com>
Date: Mon, 16 May 2011 16:07:55 +0600
Subject: [PATCH] Fix merge

---
 src/game/Level3.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index a9fbf05664c..484f9741260 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -4752,7 +4752,6 @@ bool ChatHandler::HandleResetHonorCommand(char* args)
     target->SetHonorPoints(0);
     target->SetUInt32Value(PLAYER_FIELD_KILLS, 0);
     target->SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORBALE_KILLS, 0);
-    target->SetHonorPoints(0);
     //target->SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0);
     //target->SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0);
     target->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL);