*Merge tc1 commits 1582-1590

--HG--
branch : trunk

src/game/Creature.h

@@ -734,7 +734,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
         }
         void ResetPlayerDamageReq() { m_PlayerDamageReq = GetHealth() / 2; }
         uint32 m_PlayerDamageReq;
-        
+
         void SetOriginalEntry(uint32 entry) { m_originalEntry = entry; }
 
         static float _GetDamageMod(int32 Rank);
@@ -751,7 +751,6 @@ class TRINITY_DLL_SPEC Creature : public Unit
 
         uint32 m_lootMoney;
         uint64 m_lootRecipient;
-        uint32 m_unDamageByPlayers;
 
         /// Timers
         uint32 m_deathTimer;                                // (msecs)timer for death or corpse disappearance

src/game/Level2.cpp

@@ -66,6 +66,12 @@ bool ChatHandler::HandleMuteCommand(const char* args)
         return false;
 
     uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
+    std::string mutereasonstr;
+    if(!mutereason)
+        mutereasonstr = "No reason.";
+    else
+        mutereasonstr = mutereason;
+        
 
     // find only player from same account if any
     if(!target)
@@ -88,11 +94,12 @@ bool ChatHandler::HandleMuteCommand(const char* args)
     LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id );
 
     if(target)
-        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime);
-
+        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str());
+        
     std::string nameLink = playerLink(target_name);
 
-    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink.c_str(), notspeaktime);
+    PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str());
+
     return true;
 }
 

src/game/Player.cpp

@@ -19614,17 +19614,14 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
 
 bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const
 {
-    if (pRewardSource->IsWithinDistInMap(this,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE)))
-        return true;
-
-    if (isAlive())
+    const WorldObject* player = GetCorpse();
+    if(!player || isAlive())
+        player = this;
+    
+    if(player->GetMapId() != pRewardSource->GetMapId() || player->GetInstanceId() != pRewardSource->GetInstanceId())
         return false;
 
-    Corpse* corpse = GetCorpse();
-    if (!corpse)
-        return false;
-
-    return pRewardSource->IsWithinDistInMap(corpse,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE));
+    return pRewardSource->GetDistance(player) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE);
 }
 
 uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const

src/game/SpellEffects.cpp

@@ -5991,23 +5991,23 @@ void Spell::EffectMomentMove(uint32 i)
       dist = sqrt((x-destx)*(x-destx) + (y-desty)*(y-desty));
       step = dist/10.0f;
     }
-    
+
     int j = 0;
     for(j; j<10 ;j++)
       {
-	if(fabs(z - destz) > 6)
-	  {
-	  destx -= step * cos(orientation);
-	  desty -= step * sin(orientation);
-	  ground = unitTarget->GetMap()->GetHeight(destx,desty,MAX_HEIGHT,true);
-	  floor = unitTarget->GetMap()->GetHeight(destx,desty,z, true);
-	  destz = fabs(ground - z) <= fabs(floor - z) ? ground:floor;
-	  }else
-	  break;
+    if(fabs(z - destz) > 6)
+      {
+      destx -= step * cos(orientation);
+      desty -= step * sin(orientation);
+      ground = unitTarget->GetMap()->GetHeight(destx,desty,MAX_HEIGHT,true);
+      floor = unitTarget->GetMap()->GetHeight(destx,desty,z, true);
+      destz = fabs(ground - z) <= fabs(floor - z) ? ground:floor;
+      }else
+      break;
       }
     if(j == 9)
       {
-	return;
+    return;
       }
     unitTarget->NearTeleportTo(destx, desty, destz + 0.07531, orientation, unitTarget==m_caster);
 

src/game/Unit.cpp

@@ -6306,7 +6306,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // heal amount
                     basepoints0 = triggerAmount*damage/100;
                     target = this;
-                    triggered_spell_id = 31786;
+
+                    if(basepoints0)
+                        triggered_spell_id = 31786;
                     break;
                 }
                 // Seal of Blood do damage trigger