Revert "Update SMSG_DURABILITY_DAMAGE_DEATH to 4.x."

This reverts commit bbdd2ee2737b3abf8e4eef795f53c4be90b71d9b.

5 files changed, 12 insertions, 16 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 404557a4d96..cdb9ddbcd9b 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1279,12 +1279,10 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
     {
         if (type == DAMAGE_FALL)                               // DealDamage not apply item durability loss at self damage
         {
-            float percent = 0.10f;
-            DurabilityLossAll(percent, false);
-            sLog->outStaticDebug("We are fall to death, loosing %f percents durability", percent);
+            sLog->outStaticDebug("We are fall to death, loosing 10 percents durability");
+            DurabilityLossAll(0.10f, false);
             // durability lost message
-            WorldPacket data2(SMSG_DURABILITY_DAMAGE_DEATH, 4);
-            data2 << uint32(percent*100);
+            WorldPacket data2(SMSG_DURABILITY_DAMAGE_DEATH, 0);
             GetSession()->SendPacket(&data2);
         }
 
@@ -5393,7 +5391,7 @@ Corpse* Player::GetCorpse() const
     return sObjectAccessor->GetCorpseForPlayerGUID(GetGUID());
 }
 
-void Player::DurabilityLossAll(double &percent, bool inventory)
+void Player::DurabilityLossAll(double percent, bool inventory)
 {
     for (uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
@@ -5419,7 +5417,7 @@ void Player::DurabilityLossAll(double &percent, bool inventory)
     }
 }
 
-void Player::DurabilityLoss(Item* item, double &percent)
+void Player::DurabilityLoss(Item* item, double percent)
 {
     if (!item)
         return;
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index a9ad919cd04..a594f2c02ef 100755
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1994,8 +1994,8 @@ class Player : public Unit, public GridObject<Player>
         void BuildPlayerRepop();
         void RepopAtGraveyard();
 
-        void DurabilityLossAll(double &percent, bool inventory);
-        void DurabilityLoss(Item* item, double &percent);
+        void DurabilityLossAll(double percent, bool inventory);
+        void DurabilityLoss(Item* item, double percent);
         void DurabilityPointsLossAll(int32 points, bool inventory);
         void DurabilityPointsLoss(Item* item, int32 points);
         void DurabilityPointLossForEquipSlot(EquipmentSlots slot);
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6c310f594b9..c25e4bf455b 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -15635,12 +15635,10 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
         // only if not player and not controlled by player pet. And not at BG
         if ((durabilityLoss && !player && !victim->ToPlayer()->InBattleground()) || (player && sWorld->getBoolConfig(CONFIG_DURABILITY_LOSS_IN_PVP)))
         {
-            float percent = sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH);
-            plrVictim->DurabilityLossAll(percent, false);
-            sLog->outStaticDebug("We are dead, losing %f percent durability", percent);
+            sLog->outStaticDebug("We are dead, losing %f percent durability", sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH));
+            plrVictim->DurabilityLossAll(sWorld->getRate(RATE_DURABILITY_LOSS_ON_DEATH), false);
             // durability lost message
-            WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 4);
-            data << uint32(percent*100);
+            WorldPacket data(SMSG_DURABILITY_DAMAGE_DEATH, 0);
             plrVictim->GetSession()->SendPacket(&data);
         }
         // Call KilledUnit for creatures
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 24069406894..4170a9b623b 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -762,7 +762,7 @@ void InitOpcodes()
      //DEFINE_OPCODE_HANDLER(CMSG_SHOWING_CLOAK,                           STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleShowingCloakOpcode        );
      DEFINE_OPCODE_HANDLER(SMSG_LFG_ROLE_CHOSEN,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      DEFINE_OPCODE_HANDLER(SMSG_PLAYER_SKINNED,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-     DEFINE_OPCODE_HANDLER(SMSG_DURABILITY_DAMAGE_DEATH,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+     //DEFINE_OPCODE_HANDLER(SMSG_DURABILITY_DAMAGE_DEATH,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(CMSG_SET_EXPLORATION,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      DEFINE_OPCODE_HANDLER(CMSG_SET_ACTIONBAR_TOGGLES,                   STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleSetActionBarToggles       );
      //DEFINE_OPCODE_HANDLER(UMSG_DELETE_GUILD_CHARTER,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index 037eb6af79a..d9b51a92c08 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -280,7 +280,7 @@ enum Opcodes
     CMSG_MESSAGECHAT_PARTY_LEADER                    = 0x00,
     CMSG_MESSAGECHAT_RAID                            = 0x60D1,
     CMSG_MESSAGECHAT_RAID_LEADER                     = 0x00,
-    CMSG_MESSAGECHAT_RAID_WARNING                    = 0x2449,
+    CMSG_MESSAGECHAT_RAID_WARNING                    = 0x00,
     CMSG_MESSAGECHAT_SAY                             = 0x2459,
     CMSG_MESSAGECHAT_WHISPER                         = 0x70D9,
     CMSG_MESSAGECHAT_YELL                            = 0x70C1,