[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT

* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.

TEST REV so be careful of creepy crawly bugs!

--HG--
branch : trunk

1 files changed, 8 insertions, 9 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 87bd6344c38..dd6ce3ea14e 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -579,15 +579,6 @@ void Map::Update(const uint32 &t_diff)
     }
 }
 
-void InstanceMap::Update(const uint32& t_diff)
-{
-    Map::Update(t_diff);
-
-    if(i_data)
-        i_data->Update(t_diff);
-}
-
-
 void Map::Remove(Player *player, bool remove)
 {
     CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
@@ -1557,6 +1548,14 @@ bool InstanceMap::Add(Player *player)
     return true;
 }
 
+void InstanceMap::Update(const uint32& t_diff)
+{
+	Map::Update(t_diff);
+
+	if(i_data)
+		i_data->Update(t_diff);
+}
+
 void InstanceMap::Remove(Player *player, bool remove)
 {
     sLog.outDetail("MAP: Removing player '%s' from instance '%u' of map '%s' before relocating to other map", player->GetName(), GetInstanceId(), GetMapName());