[466] Patches for both servers were updated.

includes/revision_nr.php

@@ -1,5 +1,5 @@
 <?php
-define('ARMORY_REVISION', 465);
+define('ARMORY_REVISION', 466);
 define('DB_VERSION', 'armory_r456');
 define('CONFIG_VERSION', '2001201101');
 ?>

tools/mangos/Revision.txt

@@ -1 +1 @@
-10981+
+11081+

tools/mangos/wowarmory_arena_chart.patch

@@ -94,10 +94,10 @@ index 73c2093..8ea413e 100644
 
  /*
 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
-index 4722069..674c986 100644
+index 032e98e..bbe8a22 100644
 --- a/src/game/Unit.cpp
 +++ b/src/game/Unit.cpp
-@@ -662,6 +662,10 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
+@@ -661,6 +661,10 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
              {
                  // FIXME: kept by compatibility. don't know in BG if the restriction apply.
                  bg->UpdatePlayerScore(killer, SCORE_DAMAGE_DONE, damage);
@@ -108,7 +108,7 @@ index 4722069..674c986 100644
              }
          }
 
-@@ -6065,6 +6069,10 @@ int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellPro
+@@ -6076,6 +6080,10 @@ int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellPro
      {
          ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED, gain);
          ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED, addhealth);

tools/mangos/wowarmory_patch.patch

@@ -1,5 +1,5 @@
 diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
-index a8d4155..6fc1f43 100644
+index 1fba470..d1fd7bc 100644
 --- a/src/game/AchievementMgr.cpp
 +++ b/src/game/AchievementMgr.cpp
 @@ -2076,6 +2076,9 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
@@ -33,10 +33,10 @@ index b62eda2..e68332d 100644
              return pItem;
          }
 diff --git a/src/game/Player.cpp b/src/game/Player.cpp
-index 36018e8..ba57b98 100644
+index 90e21b7..1fdc3b3 100644
 --- a/src/game/Player.cpp
 +++ b/src/game/Player.cpp
-@@ -16951,6 +16951,17 @@ void Player::SaveToDB()
+@@ -16968,6 +16968,17 @@ void Player::SaveToDB()
 
      DEBUG_FILTER_LOG(LOG_FILTER_PLAYER_STATS, "The value of player %s at save: ", m_name.c_str());
      outDebugStatsValues();
@@ -54,7 +54,7 @@ index 36018e8..ba57b98 100644
 
      CharacterDatabase.BeginTransaction();
 
-@@ -22550,3 +22561,40 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
+@@ -22563,3 +22574,40 @@ void Player::SetRestType( RestType n_r_type, uint32 areaTriggerId /*= 0*/)
              SetFFAPvP(false);
      }
  }
@@ -97,10 +97,10 @@ index 36018e8..ba57b98 100644
 +/** World of Warcraft Armory **/
 \ No newline at end of file
 diff --git a/src/game/Player.h b/src/game/Player.h
-index ab43e7d..8625a18 100644
+index bc4c0b5..793dd90 100644
 --- a/src/game/Player.h
 +++ b/src/game/Player.h
-@@ -2276,6 +2276,9 @@ class MANGOS_DLL_SPEC Player : public Unit
+@@ -2277,6 +2277,9 @@ class MANGOS_DLL_SPEC Player : public Unit
          bool TeleportToHomebind(uint32 options = 0) { return TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation(), options); }
 
          Object* GetObjectByTypeMask(ObjectGuid guid, TypeMask typemask);
@@ -111,10 +111,10 @@ index ab43e7d..8625a18 100644
          // currently visible objects at player client
          ObjectGuidSet m_clientGUIDs;
 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
-index 4722069..7077964 100644
+index 032e98e..35ac1b2 100644
 --- a/src/game/Unit.cpp
 +++ b/src/game/Unit.cpp
-@@ -866,7 +866,13 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
+@@ -865,7 +865,13 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                      if (m->IsRaidOrHeroicDungeon())
                      {
                          if(cVictim->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)

tools/trinity_core/Revision.txt

@@ -1 +1 @@
-50e4dd43dfc7abe4c0e9c1940fa7beb754f306bb
+fd66517473b772c3b2d3adfbdabae47d2088c77d

tools/trinity_core/wowarmory_arena_chart.patch

@@ -91,9 +91,8 @@ index 2e2a452..67000cb 100755
  };
 
  enum BGHonorMode
-
 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
-index 81b0233..1a6ccfa 100755
+index b1fab1b..6c8041f 100755
 --- a/src/server/game/Entities/Unit/Unit.cpp
 +++ b/src/server/game/Entities/Unit/Unit.cpp
 @@ -647,9 +647,16 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
@@ -114,7 +113,7 @@ index 81b0233..1a6ccfa 100755
          killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, damage, 0, pVictim);
          killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT, damage);
      }
-@@ -9739,6 +9746,10 @@ int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth)
+@@ -9727,6 +9734,10 @@ int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth)
      {
          pVictim->ToPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED, gain);
          pVictim->ToPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED, addhealth);

tools/trinity_core/wowarmory_patch.patch

@@ -1,8 +1,8 @@
 diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
-index fb8ed5b..d87fa63 100755
+index 327b436..00f749e 100755
 --- a/src/server/game/Achievements/AchievementMgr.cpp
 +++ b/src/server/game/Achievements/AchievementMgr.cpp
-@@ -1965,6 +1965,9 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement, b
+@@ -1972,6 +1972,9 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement, b
          return;
 
      SendAchievementEarned(achievement);
@@ -13,7 +13,7 @@ index fb8ed5b..d87fa63 100755
      ca.date = time(NULL);
      ca.changed = true;
 diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
-index 969461d..52ca8eb 100755
+index f1366a4..eb8b56a 100755
 --- a/src/server/game/Entities/Item/Item.cpp
 +++ b/src/server/game/Entities/Item/Item.cpp
 @@ -1017,6 +1017,15 @@ Item* Item::CreateItem(uint32 item, uint32 count, Player const* player)
@@ -33,10 +33,10 @@ index 969461d..52ca8eb 100755
              return pItem;
          }
 diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
-index 5618bf5..572f302 100755
+index c95e363..eb63ffe 100755
 --- a/src/server/game/Entities/Player/Player.cpp
 +++ b/src/server/game/Entities/Player/Player.cpp
-@@ -17916,6 +17916,17 @@ void Player::SaveToDB()
+@@ -18002,6 +18002,17 @@ void Player::SaveToDB()
 
      std::string sql_name = m_name;
      CharacterDatabase.escape_string(sql_name);
@@ -54,10 +54,13 @@ index 5618bf5..572f302 100755
 
      std::ostringstream ss;
      ss << "REPLACE INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags,"
-@@ -24420,3 +24431,33 @@ float Player::GetAverageItemLevel()
-
-     return ((float)sum) / count;
- }
+@@ -24545,4 +24556,34 @@ void Player::SendClearFocus(Unit* target)
+     WorldPacket data(SMSG_BREAK_TARGET, target->GetPackGUID().size());
+     data.append(target->GetPackGUID());
+     GetSession()->SendPacket(&data);
+-}
+\ No newline at end of file
++}
 +
 +/** World of Warcraft Armory **/
 +void Player::WriteWowArmoryDatabaseLog(uint32 type, uint32 data)
@@ -90,10 +93,10 @@ index 5618bf5..572f302 100755
 +/** World of Warcraft Armory **/
 \ No newline at end of file
 diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
-index caabac6..31f7752 100755
+index a4f5b42..a830628 100755
 --- a/src/server/game/Entities/Player/Player.h
 +++ b/src/server/game/Entities/Player/Player.h
-@@ -2239,6 +2239,8 @@ class Player : public Unit, public GridObject<Player>
+@@ -2241,6 +2241,8 @@ class Player : public Unit, public GridObject<Player>
          float m_homebindZ;
 
          WorldLocation GetStartPosition() const;
@@ -103,10 +106,10 @@ index caabac6..31f7752 100755
          // currently visible objects at player client
          typedef std::set<uint64> ClientGUIDs;
 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
-index 81b0233..df114f6 100755
+index b1fab1b..e24fd7a 100755
 --- a/src/server/game/Entities/Unit/Unit.cpp
 +++ b/src/server/game/Entities/Unit/Unit.cpp
-@@ -15057,7 +15057,12 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
+@@ -15054,7 +15054,12 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
                  if (m->IsRaidOrHeroicDungeon())
                  {
                      if (creature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)