Merge branch 'master' into 4.3.4

Conflicts: dep/libmpq/CMakeLists.txt src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.h src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Item/ItemPrototype.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/ReferAFriendHandler.cpp src/server/game/Movement/Spline/MoveSplineInit.h src/server/game/World/World.h src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Database/Implementation/CharacterDatabase.h src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-02 13:30:51 +01:00
commit aed36a8375
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2005-2013 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w

-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 # Author: leak
 # Date: 2010-12-06
 # Note: Based on conf file format of rev 10507
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -347,11 +347,11 @@ private:
        _mm_free(ptr);
    }

+    __m128i  mask;                                // AND mask
+    __m128i  state[SFMT_N];                       // State vector for SFMT generator
    uint32_t ix;                                  // Index into state array
    uint32_t LastInterval;                        // Last interval length for IRandom
    uint32_t RLimit;                              // Rejection limit used by IRandom
-    __m128i  mask;                                // AND mask
-    __m128i  state[SFMT_N];                       // State vector for SFMT generator
 };

 #endif // SFMT_H
@@ -4,7 +4,7 @@ index 0000000..acd3d5a
 --- /dev/null
 +++ b/dep/acelite/ace/CMakeLists.txt
@@ -0,0 +1,348 @@
-+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 +#
 +# This file is free software; as a special exception the author gives
 +# unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,5 +1,5 @@
 # Copyright (C) 2006 MySQL AB
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,5 +1,5 @@
 = TrinityCore -- Linux installation =
-Copyright (C) 2008-2012 TrinityCore (http://www.trinitycore.org)
+Copyright (C) 2008-2013 TrinityCore (http://www.trinitycore.org)

 =========================================================
 WARNING: THIS DOCUMENTATION IS NOT ALWAYS UP TO DATE.
@@ -3,7 +3,7 @@
 #define _HASH                      "@rev_hash@"
 #define _DATE                      "@rev_date@"
 #define VER_COMPANYNAME_STR        "TrinityCore Developers"
- #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2012 TrinityCore"
+ #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2013 TrinityCore"
 #define VER_FILEVERSION            0,0,0
 #define VER_FILEVERSION_STR        "@rev_date@ (@rev_hash@)"
 #define VER_PRODUCTVERSION         VER_FILEVERSION
@@ -0,0 +1,646 @@
+UPDATE `item_template` SET `armor`=2163 WHERE `entry`=1169;
+UPDATE `item_template` SET `armor`=278 WHERE `entry`=1717;
+UPDATE `item_template` SET `armor`=131 WHERE `entry`=3835;
+UPDATE `item_template` SET `armor`=358 WHERE `entry`=3844;
+UPDATE `item_template` SET `armor`=1101 WHERE `entry`=4070;
+UPDATE `item_template` SET `armor`=513 WHERE `entry`=6447;
+UPDATE `item_template` SET `armor`=775 WHERE `entry`=6725;
+UPDATE `item_template` SET `armor`=198 WHERE `entry`=6731;
+UPDATE `item_template` SET `armor`=234 WHERE `entry`=6742;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=6907;
+UPDATE `item_template` SET `armor`=363 WHERE `entry`=7919;
+UPDATE `item_template` SET `armor`=502 WHERE `entry`=7921;
+UPDATE `item_template` SET `armor`=421 WHERE `entry`=7922;
+UPDATE `item_template` SET `armor`=536 WHERE `entry`=7930;
+UPDATE `item_template` SET `armor`=382 WHERE `entry`=7933;
+UPDATE `item_template` SET `armor`=469 WHERE `entry`=7934;
+UPDATE `item_template` SET `armor`=341 WHERE `entry`=7963;
+UPDATE `item_template` SET `armor`=165 WHERE `entry`=9409;
+UPDATE `item_template` SET `armor`=391 WHERE `entry`=9625;
+UPDATE `item_template` SET `armor`=193 WHERE `entry`=10783;
+UPDATE `item_template` SET `armor`=817 WHERE `entry`=11604;
+UPDATE `item_template` SET `armor`=514 WHERE `entry`=11605;
+UPDATE `item_template` SET `armor`=433 WHERE `entry`=11606;
+UPDATE `item_template` SET `armor`=1903 WHERE `entry`=11631;
+UPDATE `item_template` SET `armor`=50 WHERE `entry`=11669;
+UPDATE `item_template` SET `armor`=484 WHERE `entry`=11703;
+UPDATE `item_template` SET `armor`=742 WHERE `entry`=11927;
+UPDATE `item_template` SET `armor`=150 WHERE `entry`=12544;
+UPDATE `item_template` SET `armor`=190 WHERE `entry`=12551;
+UPDATE `item_template` SET `armor`=553 WHERE `entry`=12557;
+UPDATE `item_template` SET `armor`=527 WHERE `entry`=12610;
+UPDATE `item_template` SET `armor`=492 WHERE `entry`=12611;
+UPDATE `item_template` SET `armor`=621 WHERE `entry`=12612;
+UPDATE `item_template` SET `armor`=738 WHERE `entry`=12613;
+UPDATE `item_template` SET `armor`=665 WHERE `entry`=12614;
+UPDATE `item_template` SET `armor`=629 WHERE `entry`=12633;
+UPDATE `item_template` SET `armor`=611 WHERE `entry`=12641;
+UPDATE `item_template` SET `armor`=711 WHERE `entry`=13079;
+UPDATE `item_template` SET `armor`=185 WHERE `entry`=13252;
+UPDATE `item_template` SET `armor`=207 WHERE `entry`=13258;
+UPDATE `item_template` SET `armor`=519 WHERE `entry`=13502;
+UPDATE `item_template` SET `armor`=688 WHERE `entry`=13955;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=35496;
+UPDATE `item_template` SET `armor`=268 WHERE `entry`=15053;
+UPDATE `item_template` SET `armor`=204 WHERE `entry`=15054;
+UPDATE `item_template` SET `armor`=167 WHERE `entry`=15055;
+UPDATE `item_template` SET `armor`=807 WHERE `entry`=15413;
+UPDATE `item_template` SET `armor`=96 WHERE `entry`=16341;
+UPDATE `item_template` SET `armor`=115 WHERE `entry`=16342;
+UPDATE `item_template` SET `armor`=125 WHERE `entry`=16437;
+UPDATE `item_template` SET `armor`=118 WHERE `entry`=16440;
+UPDATE `item_template` SET `armor`=175 WHERE `entry`=16441;
+UPDATE `item_template` SET `armor`=169 WHERE `entry`=16442;
+UPDATE `item_template` SET `armor`=199 WHERE `entry`=16443;
+UPDATE `item_template` SET `armor`=147 WHERE `entry`=16444;
+UPDATE `item_template` SET `armor`=207 WHERE `entry`=16446;
+UPDATE `item_template` SET `armor`=192 WHERE `entry`=16448;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=16449;
+UPDATE `item_template` SET `armor`=242 WHERE `entry`=16450;
+UPDATE `item_template` SET `armor`=234 WHERE `entry`=16451;
+UPDATE `item_template` SET `armor`=291 WHERE `entry`=16452;
+UPDATE `item_template` SET `armor`=291 WHERE `entry`=16453;
+UPDATE `item_template` SET `armor`=212 WHERE `entry`=16454;
+UPDATE `item_template` SET `armor`=254 WHERE `entry`=16455;
+UPDATE `item_template` SET `armor`=262 WHERE `entry`=16456;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=16457;
+UPDATE `item_template` SET `armor`=197 WHERE `entry`=16459;
+UPDATE `item_template` SET `armor`=405 WHERE `entry`=16462;
+UPDATE `item_template` SET `armor`=363 WHERE `entry`=16463;
+UPDATE `item_template` SET `armor`=486 WHERE `entry`=16465;
+UPDATE `item_template` SET `armor`=587 WHERE `entry`=16466;
+UPDATE `item_template` SET `armor`=502 WHERE `entry`=16467;
+UPDATE `item_template` SET `armor`=453 WHERE `entry`=16468;
+UPDATE `item_template` SET `armor`=994 WHERE `entry`=16477;
+UPDATE `item_template` SET `armor`=815 WHERE `entry`=16478;
+UPDATE `item_template` SET `armor`=842 WHERE `entry`=16479;
+UPDATE `item_template` SET `armor`=670 WHERE `entry`=16483;
+UPDATE `item_template` SET `armor`=603 WHERE `entry`=16484;
+UPDATE `item_template` SET `armor`=175 WHERE `entry`=16533;
+UPDATE `item_template` SET `armor`=169 WHERE `entry`=16534;
+UPDATE `item_template` SET `armor`=199 WHERE `entry`=16535;
+UPDATE `item_template` SET `armor`=147 WHERE `entry`=16536;
+UPDATE `item_template` SET `armor`=125 WHERE `entry`=16539;
+UPDATE `item_template` SET `armor`=118 WHERE `entry`=16540;
+UPDATE `item_template` SET `armor`=994 WHERE `entry`=16541;
+UPDATE `item_template` SET `armor`=815 WHERE `entry`=16542;
+UPDATE `item_template` SET `armor`=842 WHERE `entry`=16543;
+UPDATE `item_template` SET `armor`=670 WHERE `entry`=16545;
+UPDATE `item_template` SET `armor`=603 WHERE `entry`=16548;
+UPDATE `item_template` SET `armor`=291 WHERE `entry`=16549;
+UPDATE `item_template` SET `armor`=234 WHERE `entry`=16550;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=16551;
+UPDATE `item_template` SET `armor`=242 WHERE `entry`=16552;
+UPDATE `item_template` SET `armor`=197 WHERE `entry`=16554;
+UPDATE `item_template` SET `armor`=192 WHERE `entry`=16555;
+UPDATE `item_template` SET `armor`=212 WHERE `entry`=16560;
+UPDATE `item_template` SET `armor`=254 WHERE `entry`=16561;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=16562;
+UPDATE `item_template` SET `armor`=291 WHERE `entry`=16563;
+UPDATE `item_template` SET `armor`=262 WHERE `entry`=16564;
+UPDATE `item_template` SET `armor`=587 WHERE `entry`=16565;
+UPDATE `item_template` SET `armor`=486 WHERE `entry`=16566;
+UPDATE `item_template` SET `armor`=502 WHERE `entry`=16567;
+UPDATE `item_template` SET `armor`=453 WHERE `entry`=16568;
+UPDATE `item_template` SET `armor`=405 WHERE `entry`=16569;
+UPDATE `item_template` SET `armor`=363 WHERE `entry`=16571;
+UPDATE `item_template` SET `armor`=393 WHERE `entry`=16574;
+UPDATE `item_template` SET `armor`=863 WHERE `entry`=17013;
+UPDATE `item_template` SET `armor`=436 WHERE `entry`=17014;
+UPDATE `item_template` SET `armor`=124 WHERE `entry`=17107;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=17578;
+UPDATE `item_template` SET `armor`=149 WHERE `entry`=17579;
+UPDATE `item_template` SET `armor`=127 WHERE `entry`=17580;
+UPDATE `item_template` SET `armor`=169 WHERE `entry`=17581;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=17583;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=17586;
+UPDATE `item_template` SET `armor`=127 WHERE `entry`=17590;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=17591;
+UPDATE `item_template` SET `armor`=169 WHERE `entry`=17592;
+UPDATE `item_template` SET `armor`=149 WHERE `entry`=17593;
+UPDATE `item_template` SET `armor`=175 WHERE `entry`=17602;
+UPDATE `item_template` SET `armor`=179 WHERE `entry`=17603;
+UPDATE `item_template` SET `armor`=157 WHERE `entry`=17604;
+UPDATE `item_template` SET `armor`=199 WHERE `entry`=17605;
+UPDATE `item_template` SET `armor`=135 WHERE `entry`=17607;
+UPDATE `item_template` SET `armor`=128 WHERE `entry`=17608;
+UPDATE `item_template` SET `armor`=135 WHERE `entry`=17618;
+UPDATE `item_template` SET `armor`=128 WHERE `entry`=17620;
+UPDATE `item_template` SET `armor`=157 WHERE `entry`=17622;
+UPDATE `item_template` SET `armor`=175 WHERE `entry`=17623;
+UPDATE `item_template` SET `armor`=199 WHERE `entry`=17624;
+UPDATE `item_template` SET `armor`=179 WHERE `entry`=17625;
+UPDATE `item_template` SET `armor`=683 WHERE `entry`=17734;
+UPDATE `item_template` SET `armor`=2916 WHERE `entry`=18168;
+UPDATE `item_template` SET `armor`=383 WHERE `entry`=18351;
+UPDATE `item_template` SET `armor`=538 WHERE `entry`=18383;
+UPDATE `item_template` SET `armor`=214 WHERE `entry`=18413;
+UPDATE `item_template` SET `armor`=66 WHERE `entry`=18427;
+UPDATE `item_template` SET `armor`=66 WHERE `entry`=18440;
+UPDATE `item_template` SET `armor`=96 WHERE `entry`=18441;
+UPDATE `item_template` SET `armor`=115 WHERE `entry`=18461;
+UPDATE `item_template` SET `armor`=777 WHERE `entry`=18503;
+UPDATE `item_template` SET `armor`=552 WHERE `entry`=18521;
+UPDATE `item_template` SET `armor`=2106 WHERE `entry`=18535;
+UPDATE `item_template` SET `armor`=114 WHERE `entry`=18689;
+UPDATE `item_template` SET `armor`=696 WHERE `entry`=18690;
+UPDATE `item_template` SET `armor`=371 WHERE `entry`=18712;
+UPDATE `item_template` SET `armor`=584 WHERE `entry`=18718;
+UPDATE `item_template` SET `armor`=711 WHERE `entry`=18806;
+UPDATE `item_template` SET `armor`=447 WHERE `entry`=18829;
+UPDATE `item_template` SET `armor`=834 WHERE `entry`=18861;
+UPDATE `item_template` SET `armor`=110 WHERE `entry`=18879;
+UPDATE `item_template` SET `armor`=845 WHERE `entry`=19148;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=19149;
+UPDATE `item_template` SET `armor`=310 WHERE `entry`=19381;
+UPDATE `item_template` SET `armor`=177 WHERE `entry`=19386;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=19405;
+UPDATE `item_template` SET `armor`=237 WHERE `entry`=19509;
+UPDATE `item_template` SET `armor`=736 WHERE `entry`=19693;
+UPDATE `item_template` SET `armor`=722 WHERE `entry`=19694;
+UPDATE `item_template` SET `armor`=932 WHERE `entry`=19822;
+UPDATE `item_template` SET `armor`=315 WHERE `entry`=19838;
+UPDATE `item_template` SET `armor`=180 WHERE `entry`=19839;
+UPDATE `item_template` SET `armor`=133 WHERE `entry`=19840;
+UPDATE `item_template` SET `armor`=240 WHERE `entry`=19877;
+UPDATE `item_template` SET `armor`=140 WHERE `entry`=19888;
+UPDATE `item_template` SET `armor`=184 WHERE `entry`=19892;
+UPDATE `item_template` SET `armor`=201 WHERE `entry`=19928;
+UPDATE `item_template` SET `armor`=741 WHERE `entry`=20039;
+UPDATE `item_template` SET `armor`=159 WHERE `entry`=20045;
+UPDATE `item_template` SET `armor`=159 WHERE `entry`=20046;
+UPDATE `item_template` SET `armor`=150 WHERE `entry`=20047;
+UPDATE `item_template` SET `armor`=181 WHERE `entry`=20052;
+UPDATE `item_template` SET `armor`=181 WHERE `entry`=20053;
+UPDATE `item_template` SET `armor`=161 WHERE `entry`=20054;
+UPDATE `item_template` SET `armor`=279 WHERE `entry`=20059;
+UPDATE `item_template` SET `armor`=279 WHERE `entry`=20060;
+UPDATE `item_template` SET `armor`=196 WHERE `entry`=20061;
+UPDATE `item_template` SET `armor`=100 WHERE `entry`=20069;
+UPDATE `item_template` SET `armor`=40 WHERE `entry`=20070;
+UPDATE `item_template` SET `armor`=132 WHERE `entry`=20094;
+UPDATE `item_template` SET `armor`=103 WHERE `entry`=20095;
+UPDATE `item_template` SET `armor`=84 WHERE `entry`=20096;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20097;
+UPDATE `item_template` SET `armor`=105 WHERE `entry`=20098;
+UPDATE `item_template` SET `armor`=88 WHERE `entry`=20099;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=20100;
+UPDATE `item_template` SET `armor`=129 WHERE `entry`=20101;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=20102;
+UPDATE `item_template` SET `armor`=136 WHERE `entry`=20103;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20104;
+UPDATE `item_template` SET `armor`=91 WHERE `entry`=20105;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=20112;
+UPDATE `item_template` SET `armor`=129 WHERE `entry`=20113;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=20114;
+UPDATE `item_template` SET `armor`=136 WHERE `entry`=20115;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20116;
+UPDATE `item_template` SET `armor`=91 WHERE `entry`=20117;
+UPDATE `item_template` SET `armor`=161 WHERE `entry`=20159;
+UPDATE `item_template` SET `armor`=132 WHERE `entry`=20160;
+UPDATE `item_template` SET `armor`=103 WHERE `entry`=20161;
+UPDATE `item_template` SET `armor`=84 WHERE `entry`=20162;
+UPDATE `item_template` SET `armor`=150 WHERE `entry`=20163;
+UPDATE `item_template` SET `armor`=88 WHERE `entry`=20164;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20165;
+UPDATE `item_template` SET `armor`=105 WHERE `entry`=20166;
+UPDATE `item_template` SET `armor`=181 WHERE `entry`=20167;
+UPDATE `item_template` SET `armor`=129 WHERE `entry`=20168;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=20169;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=20170;
+UPDATE `item_template` SET `armor`=159 WHERE `entry`=20171;
+UPDATE `item_template` SET `armor`=91 WHERE `entry`=20172;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20173;
+UPDATE `item_template` SET `armor`=136 WHERE `entry`=20174;
+UPDATE `item_template` SET `armor`=279 WHERE `entry`=20175;
+UPDATE `item_template` SET `armor`=196 WHERE `entry`=20176;
+UPDATE `item_template` SET `armor`=181 WHERE `entry`=20186;
+UPDATE `item_template` SET `armor`=129 WHERE `entry`=20187;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=20188;
+UPDATE `item_template` SET `armor`=145 WHERE `entry`=20189;
+UPDATE `item_template` SET `armor`=159 WHERE `entry`=20190;
+UPDATE `item_template` SET `armor`=91 WHERE `entry`=20191;
+UPDATE `item_template` SET `armor`=113 WHERE `entry`=20192;
+UPDATE `item_template` SET `armor`=136 WHERE `entry`=20193;
+UPDATE `item_template` SET `armor`=279 WHERE `entry`=20194;
+UPDATE `item_template` SET `armor`=40 WHERE `entry`=20214;
+UPDATE `item_template` SET `armor`=100 WHERE `entry`=20220;
+UPDATE `item_template` SET `armor`=173 WHERE `entry`=20259;
+UPDATE `item_template` SET `armor`=220 WHERE `entry`=20476;
+UPDATE `item_template` SET `armor`=308 WHERE `entry`=20477;
+UPDATE `item_template` SET `armor`=485 WHERE `entry`=20478;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=20627;
+UPDATE `item_template` SET `armor`=99 WHERE `entry`=20693;
+UPDATE `item_template` SET `armor`=512 WHERE `entry`=20710;
+UPDATE `item_template` SET `armor`=30 WHERE `entry`=20907;
+UPDATE `item_template` SET `armor`=164 WHERE `entry`=21348;
+UPDATE `item_template` SET `armor`=123 WHERE `entry`=21349;
+UPDATE `item_template` SET `armor`=132 WHERE `entry`=21350;
+UPDATE `item_template` SET `armor`=201 WHERE `entry`=21351;
+UPDATE `item_template` SET `armor`=173 WHERE `entry`=21352;
+UPDATE `item_template` SET `armor`=143 WHERE `entry`=21456;
+UPDATE `item_template` SET `armor`=287 WHERE `entry`=21467;
+UPDATE `item_template` SET `armor`=182 WHERE `entry`=21501;
+UPDATE `item_template` SET `armor`=494 WHERE `entry`=21503;
+UPDATE `item_template` SET `armor`=100 WHERE `entry`=21601;
+UPDATE `item_template` SET `armor`=269 WHERE `entry`=21605;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=21645;
+UPDATE `item_template` SET `armor`=204 WHERE `entry`=21675;
+UPDATE `item_template` SET `armor`=224 WHERE `entry`=21682;
+UPDATE `item_template` SET `armor`=276 WHERE `entry`=21693;
+UPDATE `item_template` SET `armor`=727 WHERE `entry`=21706;
+UPDATE `item_template` SET `armor`=198 WHERE `entry`=21888;
+UPDATE `item_template` SET `armor`=219 WHERE `entry`=22301;
+UPDATE `item_template` SET `armor`=203 WHERE `entry`=22302;
+UPDATE `item_template` SET `armor`=207 WHERE `entry`=22303;
+UPDATE `item_template` SET `armor`=144 WHERE `entry`=22304;
+UPDATE `item_template` SET `armor`=155 WHERE `entry`=22305;
+UPDATE `item_template` SET `armor`=139 WHERE `entry`=22306;
+UPDATE `item_template` SET `armor`=150 WHERE `entry`=22311;
+UPDATE `item_template` SET `armor`=108 WHERE `entry`=22313;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=22410;
+UPDATE `item_template` SET `armor`=257 WHERE `entry`=22740;
+UPDATE `item_template` SET `armor`=287 WHERE `entry`=22741;
+UPDATE `item_template` SET `armor`=200 WHERE `entry`=22747;
+UPDATE `item_template` SET `armor`=257 WHERE `entry`=22749;
+UPDATE `item_template` SET `armor`=287 WHERE `entry`=22750;
+UPDATE `item_template` SET `armor`=200 WHERE `entry`=22752;
+UPDATE `item_template` SET `armor`=166 WHERE `entry`=22856;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=22860;
+UPDATE `item_template` SET `armor`=155 WHERE `entry`=22864;
+UPDATE `item_template` SET `armor`=98 WHERE `entry`=22869;
+UPDATE `item_template` SET `armor`=98 WHERE `entry`=22870;
+UPDATE `item_template` SET `armor`=218 WHERE `entry`=22877;
+UPDATE `item_template` SET `armor`=215 WHERE `entry`=22878;
+UPDATE `item_template` SET `armor`=248 WHERE `entry`=22879;
+UPDATE `item_template` SET `armor`=225 WHERE `entry`=22880;
+UPDATE `item_template` SET `armor`=144 WHERE `entry`=22882;
+UPDATE `item_template` SET `armor`=144 WHERE `entry`=22883;
+UPDATE `item_template` SET `armor`=156 WHERE `entry`=22885;
+UPDATE `item_template` SET `armor`=156 WHERE `entry`=22886;
+UPDATE `item_template` SET `armor`=212 WHERE `entry`=22938;
+UPDATE `item_template` SET `armor`=140 WHERE `entry`=23018;
+UPDATE `item_template` SET `armor`=3994 WHERE `entry`=23043;
+UPDATE `item_template` SET `armor`=467 WHERE `entry`=23069;
+UPDATE `item_template` SET `armor`=446 WHERE `entry`=23226;
+UPDATE `item_template` SET `armor`=198 WHERE `entry`=23253;
+UPDATE `item_template` SET `armor`=206 WHERE `entry`=23254;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=23257;
+UPDATE `item_template` SET `armor`=196 WHERE `entry`=23258;
+UPDATE `item_template` SET `armor`=131 WHERE `entry`=23261;
+UPDATE `item_template` SET `armor`=115 WHERE `entry`=23262;
+UPDATE `item_template` SET `armor`=141 WHERE `entry`=23263;
+UPDATE `item_template` SET `armor`=135 WHERE `entry`=23264;
+UPDATE `item_template` SET `armor`=155 WHERE `entry`=23284;
+UPDATE `item_template` SET `armor`=166 WHERE `entry`=23285;
+UPDATE `item_template` SET `armor`=98 WHERE `entry`=23288;
+UPDATE `item_template` SET `armor`=98 WHERE `entry`=23290;
+UPDATE `item_template` SET `armor`=104 WHERE `entry`=23291;
+UPDATE `item_template` SET `armor`=218 WHERE `entry`=23294;
+UPDATE `item_template` SET `armor`=215 WHERE `entry`=23295;
+UPDATE `item_template` SET `armor`=248 WHERE `entry`=23298;
+UPDATE `item_template` SET `armor`=225 WHERE `entry`=23299;
+UPDATE `item_template` SET `armor`=144 WHERE `entry`=23302;
+UPDATE `item_template` SET `armor`=156 WHERE `entry`=23303;
+UPDATE `item_template` SET `armor`=144 WHERE `entry`=23304;
+UPDATE `item_template` SET `armor`=156 WHERE `entry`=23305;
+UPDATE `item_template` SET `armor`=198 WHERE `entry`=23308;
+UPDATE `item_template` SET `armor`=206 WHERE `entry`=23309;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=23312;
+UPDATE `item_template` SET `armor`=196 WHERE `entry`=23313;
+UPDATE `item_template` SET `armor`=131 WHERE `entry`=23316;
+UPDATE `item_template` SET `armor`=115 WHERE `entry`=23317;
+UPDATE `item_template` SET `armor`=141 WHERE `entry`=23318;
+UPDATE `item_template` SET `armor`=135 WHERE `entry`=23319;
+UPDATE `item_template` SET `armor`=943 WHERE `entry`=23517;
+UPDATE `item_template` SET `armor`=1257 WHERE `entry`=23518;
+UPDATE `item_template` SET `armor`=1284 WHERE `entry`=23519;
+UPDATE `item_template` SET `armor`=1366 WHERE `entry`=23535;
+UPDATE `item_template` SET `armor`=223 WHERE `entry`=23825;
+UPDATE `item_template` SET `armor`=349 WHERE `entry`=24258;
+UPDATE `item_template` SET `armor`=271 WHERE `entry`=24379;
+UPDATE `item_template` SET `armor`=181 WHERE `entry`=26030;
+UPDATE `item_template` SET `armor`=184 WHERE `entry`=27645;
+UPDATE `item_template` SET `armor`=284 WHERE `entry`=27648;
+UPDATE `item_template` SET `armor`=205 WHERE `entry`=27768;
+UPDATE `item_template` SET `armor`=216 WHERE `entry`=27988;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=28126;
+UPDATE `item_template` SET `armor`=356 WHERE `entry`=28127;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=28128;
+UPDATE `item_template` SET `armor`=331 WHERE `entry`=28129;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=28130;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=28136;
+UPDATE `item_template` SET `armor`=356 WHERE `entry`=28137;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=28138;
+UPDATE `item_template` SET `armor`=331 WHERE `entry`=28139;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=28140;
+UPDATE `item_template` SET `armor`=143 WHERE `entry`=28211;
+UPDATE `item_template` SET `armor`=390 WHERE `entry`=28256;
+UPDATE `item_template` SET `armor`=234 WHERE `entry`=28301;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=28443;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=28444;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28445;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=28446;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=28447;
+UPDATE `item_template` SET `armor`=187 WHERE `entry`=28448;
+UPDATE `item_template` SET `armor`=248 WHERE `entry`=28574;
+UPDATE `item_template` SET `armor`=248 WHERE `entry`=28575;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28618;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=28619;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=28620;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=28622;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=28623;
+UPDATE `item_template` SET `armor`=385 WHERE `entry`=28660;
+UPDATE `item_template` SET `armor`=223 WHERE `entry`=28675;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28719;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=28720;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=28721;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=28722;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=28723;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28811;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=28812;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=28813;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=28814;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=28815;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28871;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=28872;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=28873;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=28874;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=28875;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=28976;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=28977;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=28978;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=29004;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=29005;
+UPDATE `item_template` SET `armor`=187 WHERE `entry`=29006;
+UPDATE `item_template` SET `armor`=294 WHERE `entry`=29276;
+UPDATE `item_template` SET `armor`=350 WHERE `entry`=29277;
+UPDATE `item_template` SET `armor`=371 WHERE `entry`=29278;
+UPDATE `item_template` SET `armor`=392 WHERE `entry`=29279;
+UPDATE `item_template` SET `armor`=294 WHERE `entry`=29384;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=29385;
+UPDATE `item_template` SET `armor`=393 WHERE `entry`=29607;
+UPDATE `item_template` SET `armor`=262 WHERE `entry`=29777;
+UPDATE `item_template` SET `armor`=489 WHERE `entry`=30069;
+UPDATE `item_template` SET `armor`=257 WHERE `entry`=30931;
+UPDATE `item_template` SET `armor`=195 WHERE `entry`=30932;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=31375;
+UPDATE `item_template` SET `armor`=356 WHERE `entry`=31376;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=31377;
+UPDATE `item_template` SET `armor`=331 WHERE `entry`=31378;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=31379;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=31584;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=31585;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=31586;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=31587;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=31588;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=31589;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=31590;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=31591;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=31592;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=31593;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=31594;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=31595;
+UPDATE `item_template` SET `armor`=259 WHERE `entry`=31596;
+UPDATE `item_template` SET `armor`=307 WHERE `entry`=31597;
+UPDATE `item_template` SET `armor`=187 WHERE `entry`=31598;
+UPDATE `item_template` SET `armor`=187 WHERE `entry`=31599;
+UPDATE `item_template` SET `armor`=324 WHERE `entry`=31967;
+UPDATE `item_template` SET `armor`=404 WHERE `entry`=31968;
+UPDATE `item_template` SET `armor`=417 WHERE `entry`=31969;
+UPDATE `item_template` SET `armor`=377 WHERE `entry`=31971;
+UPDATE `item_template` SET `armor`=498 WHERE `entry`=31972;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=31973;
+UPDATE `item_template` SET `armor`=395 WHERE `entry`=31974;
+UPDATE `item_template` SET `armor`=410 WHERE `entry`=31975;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=31976;
+UPDATE `item_template` SET `armor`=438 WHERE `entry`=31977;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=31979;
+UPDATE `item_template` SET `armor`=395 WHERE `entry`=31980;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=31981;
+UPDATE `item_template` SET `armor`=438 WHERE `entry`=31982;
+UPDATE `item_template` SET `armor`=410 WHERE `entry`=31983;
+UPDATE `item_template` SET `armor`=310 WHERE `entry`=31987;
+UPDATE `item_template` SET `armor`=390 WHERE `entry`=31988;
+UPDATE `item_template` SET `armor`=417 WHERE `entry`=31989;
+UPDATE `item_template` SET `armor`=377 WHERE `entry`=31990;
+UPDATE `item_template` SET `armor`=470 WHERE `entry`=31991;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=32015;
+UPDATE `item_template` SET `armor`=395 WHERE `entry`=32016;
+UPDATE `item_template` SET `armor`=410 WHERE `entry`=32017;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=32018;
+UPDATE `item_template` SET `armor`=438 WHERE `entry`=32019;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=32034;
+UPDATE `item_template` SET `armor`=395 WHERE `entry`=32035;
+UPDATE `item_template` SET `armor`=410 WHERE `entry`=32036;
+UPDATE `item_template` SET `armor`=311 WHERE `entry`=32037;
+UPDATE `item_template` SET `armor`=438 WHERE `entry`=32038;
+UPDATE `item_template` SET `armor`=310 WHERE `entry`=32056;
+UPDATE `item_template` SET `armor`=390 WHERE `entry`=32057;
+UPDATE `item_template` SET `armor`=431 WHERE `entry`=32058;
+UPDATE `item_template` SET `armor`=363 WHERE `entry`=32059;
+UPDATE `item_template` SET `armor`=470 WHERE `entry`=32060;
+UPDATE `item_template` SET `armor`=336 WHERE `entry`=32786;
+UPDATE `item_template` SET `armor`=336 WHERE `entry`=32788;
+UPDATE `item_template` SET `armor`=336 WHERE `entry`=32796;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=32798;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=32800;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=32808;
+UPDATE `item_template` SET `armor`=216 WHERE `entry`=32810;
+UPDATE `item_template` SET `armor`=216 WHERE `entry`=32812;
+UPDATE `item_template` SET `armor`=216 WHERE `entry`=32821;
+UPDATE `item_template` SET `armor`=295 WHERE `entry`=33054;
+UPDATE `item_template` SET `armor`=293 WHERE `entry`=33759;
+UPDATE `item_template` SET `armor`=471 WHERE `entry`=33702;
+UPDATE `item_template` SET `armor`=343 WHERE `entry`=33700;
+UPDATE `item_template` SET `armor`=409 WHERE `entry`=33677;
+UPDATE `item_template` SET `armor`=409 WHERE `entry`=33718;
+UPDATE `item_template` SET `armor`=293 WHERE `entry`=33717;
+UPDATE `item_template` SET `armor`=409 WHERE `entry`=33745;
+UPDATE `item_template` SET `armor`=443 WHERE `entry`=33673;
+UPDATE `item_template` SET `armor`=409 WHERE `entry`=33758;
+UPDATE `item_template` SET `armor`=346 WHERE `entry`=33593;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=33761;
+UPDATE `item_template` SET `armor`=329 WHERE `entry`=33690;
+UPDATE `item_template` SET `armor`=293 WHERE `entry`=33676;
+UPDATE `item_template` SET `armor`=529 WHERE `entry`=33675;
+UPDATE `item_template` SET `armor`=454 WHERE `entry`=33680;
+UPDATE `item_template` SET `armor`=443 WHERE `entry`=33701;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=33914;
+UPDATE `item_template` SET `armor`=173 WHERE `entry`=33913;
+UPDATE `item_template` SET `armor`=454 WHERE `entry`=33721;
+UPDATE `item_template` SET `armor`=208 WHERE `entry`=33900;
+UPDATE `item_template` SET `armor`=454 WHERE `entry`=33760;
+UPDATE `item_template` SET `armor`=529 WHERE `entry`=33704;
+UPDATE `item_template` SET `armor`=409 WHERE `entry`=33683;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=33884;
+UPDATE `item_template` SET `armor`=208 WHERE `entry`=33912;
+UPDATE `item_template` SET `armor`=293 WHERE `entry`=33684;
+UPDATE `item_template` SET `armor`=173 WHERE `entry`=33901;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=33678;
+UPDATE `item_template` SET `armor`=208 WHERE `entry`=33882;
+UPDATE `item_template` SET `armor`=173 WHERE `entry`=33883;
+UPDATE `item_template` SET `armor`=293 WHERE `entry`=33744;
+UPDATE `item_template` SET `armor`=300 WHERE `entry`=33879;
+UPDATE `item_template` SET `armor`=343 WHERE `entry`=33671;
+UPDATE `item_template` SET `armor`=415 WHERE `entry`=33691;
+UPDATE `item_template` SET `armor`=501 WHERE `entry`=33694;
+UPDATE `item_template` SET `armor`=300 WHERE `entry`=33885;
+UPDATE `item_template` SET `armor`=357 WHERE `entry`=33886;
+UPDATE `item_template` SET `armor`=236 WHERE `entry`=33887;
+UPDATE `item_template` SET `armor`=238 WHERE `entry`=33902;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=33672;
+UPDATE `item_template` SET `armor`=236 WHERE `entry`=33881;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=33686;
+UPDATE `item_template` SET `armor`=454 WHERE `entry`=33685;
+UPDATE `item_template` SET `armor`=443 WHERE `entry`=33692;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=33719;
+UPDATE `item_template` SET `armor`=454 WHERE `entry`=33748;
+UPDATE `item_template` SET `armor`=357 WHERE `entry`=33880;
+UPDATE `item_template` SET `armor`=236 WHERE `entry`=33917;
+UPDATE `item_template` SET `armor`=329 WHERE `entry`=33767;
+UPDATE `item_template` SET `armor`=457 WHERE `entry`=33769;
+UPDATE `item_template` SET `armor`=357 WHERE `entry`=33916;
+UPDATE `item_template` SET `armor`=415 WHERE `entry`=33768;
+UPDATE `item_template` SET `armor`=501 WHERE `entry`=33771;
+UPDATE `item_template` SET `armor`=300 WHERE `entry`=33915;
+UPDATE `item_template` SET `armor`=424 WHERE `entry`=33746;
+UPDATE `item_template` SET `armor`=323 WHERE `entry`=33679;
+UPDATE `item_template` SET `armor`=323 WHERE `entry`=33682;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=33693;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=33674;
+UPDATE `item_template` SET `armor`=386 WHERE `entry`=33770;
+UPDATE `item_template` SET `armor`=323 WHERE `entry`=33747;
+UPDATE `item_template` SET `armor`=323 WHERE `entry`=33720;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=33703;
+UPDATE `item_template` SET `armor`=323 WHERE `entry`=33757;
+UPDATE `item_template` SET `armor`=252 WHERE `entry`=34706;
+UPDATE `item_template` SET `armor`=387 WHERE `entry`=34810;
+UPDATE `item_template` SET `armor`=392 WHERE `entry`=34888;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=35356;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=35357;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35358;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=35359;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35360;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=35361;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=35362;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35363;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=35364;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35365;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=35371;
+UPDATE `item_template` SET `armor`=267 WHERE `entry`=35372;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35373;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=35374;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35375;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35469;
+UPDATE `item_template` SET `armor`=249 WHERE `entry`=35470;
+UPDATE `item_template` SET `armor`=213 WHERE `entry`=35471;
+UPDATE `item_template` SET `armor`=308 WHERE `entry`=34213;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35003;
+UPDATE `item_template` SET `armor`=354 WHERE `entry`=35022;
+UPDATE `item_template` SET `armor`=478 WHERE `entry`=35024;
+UPDATE `item_template` SET `armor`=430 WHERE `entry`=35025;
+UPDATE `item_template` SET `armor`=541 WHERE `entry`=35026;
+UPDATE `item_template` SET `armor`=447 WHERE `entry`=35023;
+UPDATE `item_template` SET `armor`=430 WHERE `entry`=35001;
+UPDATE `item_template` SET `armor`=569 WHERE `entry`=35002;
+UPDATE `item_template` SET `armor`=461 WHERE `entry`=34999;
+UPDATE `item_template` SET `armor`=368 WHERE `entry`=34998;
+UPDATE `item_template` SET `armor`=478 WHERE `entry`=35000;
+UPDATE `item_template` SET `armor`=416 WHERE `entry`=35114;
+UPDATE `item_template` SET `armor`=541 WHERE `entry`=35115;
+UPDATE `item_template` SET `armor`=447 WHERE `entry`=35112;
+UPDATE `item_template` SET `armor`=354 WHERE `entry`=35111;
+UPDATE `item_template` SET `armor`=492 WHERE `entry`=35113;
+UPDATE `item_template` SET `armor`=476 WHERE `entry`=35099;
+UPDATE `item_template` SET `armor`=442 WHERE `entry`=35100;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35098;
+UPDATE `item_template` SET `armor`=339 WHERE `entry`=35096;
+UPDATE `item_template` SET `armor`=426 WHERE `entry`=35097;
+UPDATE `item_template` SET `armor`=368 WHERE `entry`=35032;
+UPDATE `item_template` SET `armor`=569 WHERE `entry`=35036;
+UPDATE `item_template` SET `armor`=475 WHERE `entry`=35033;
+UPDATE `item_template` SET `armor`=430 WHERE `entry`=35035;
+UPDATE `item_template` SET `armor`=506 WHERE `entry`=35034;
+UPDATE `item_template` SET `armor`=442 WHERE `entry`=35005;
+UPDATE `item_template` SET `armor`=476 WHERE `entry`=35007;
+UPDATE `item_template` SET `armor`=339 WHERE `entry`=35006;
+UPDATE `item_template` SET `armor`=426 WHERE `entry`=35004;
+UPDATE `item_template` SET `armor`=339 WHERE `entry`=35009;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35011;
+UPDATE `item_template` SET `armor`=476 WHERE `entry`=35012;
+UPDATE `item_template` SET `armor`=426 WHERE `entry`=35010;
+UPDATE `item_template` SET `armor`=442 WHERE `entry`=35013;
+UPDATE `item_template` SET `armor`=219 WHERE `entry`=35153;
+UPDATE `item_template` SET `armor`=219 WHERE `entry`=35159;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35053;
+UPDATE `item_template` SET `armor`=219 WHERE `entry`=35164;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35165;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35152;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35167;
+UPDATE `item_template` SET `armor`=322 WHERE `entry`=35154;
+UPDATE `item_template` SET `armor`=183 WHERE `entry`=35168;
+UPDATE `item_template` SET `armor`=183 WHERE `entry`=35174;
+UPDATE `item_template` SET `armor`=442 WHERE `entry`=35055;
+UPDATE `item_template` SET `armor`=183 WHERE `entry`=35179;
+UPDATE `item_template` SET `armor`=385 WHERE `entry`=35139;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35169;
+UPDATE `item_template` SET `armor`=476 WHERE `entry`=35057;
+UPDATE `item_template` SET `armor`=426 WHERE `entry`=35054;
+UPDATE `item_template` SET `armor`=442 WHERE `entry`=35085;
+UPDATE `item_template` SET `armor`=476 WHERE `entry`=35087;
+UPDATE `item_template` SET `armor`=339 WHERE `entry`=35086;
+UPDATE `item_template` SET `armor`=426 WHERE `entry`=35084;
+UPDATE `item_template` SET `armor`=306 WHERE `entry`=35083;
+UPDATE `item_template` SET `armor`=339 WHERE `entry`=35056;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35149;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35180;
+UPDATE `item_template` SET `armor`=385 WHERE `entry`=35150;
+UPDATE `item_template` SET `armor`=385 WHERE `entry`=35137;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35138;
+UPDATE `item_template` SET `armor`=253 WHERE `entry`=35144;
+UPDATE `item_template` SET `armor`=170 WHERE `entry`=6733;
+UPDATE `item_template` SET `armor`=605 WHERE `entry`=15141;
+UPDATE `item_template` SET `armor`=504 WHERE `entry`=37084;
+UPDATE `item_template` SET `armor`=486 WHERE `entry`=39225;
+UPDATE `item_template` SET `armor`=490 WHERE `entry`=40252;
+UPDATE `item_template` SET `armor`=1788 WHERE `entry`=41190;
+UPDATE `item_template` SET `armor`=337 WHERE `entry`=41238;
+UPDATE `item_template` SET `armor`=1438 WHERE `entry`=42826;
+UPDATE `item_template` SET `armor`=2880 WHERE `entry`=45267;
+UPDATE `item_template` SET `armor`=3500 WHERE `entry`=49904;
+UPDATE `item_template` SET `armor`=737 WHERE `entry`=50466;
+UPDATE `item_template` SET `armor`=1735 WHERE `entry`=50802;
+UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50849;
+UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50850;
+UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50856;
+UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50857;
+UPDATE `item_template` SET `armor`=2461 WHERE `entry`=50863;
+UPDATE `item_template` SET `armor`=3817 WHERE `entry`=50968;
+UPDATE `item_template` SET `armor`=2658 WHERE `entry`=50978;
+UPDATE `item_template` SET `armor`=2143 WHERE `entry`=50991;
+UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51172;
+UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51174;
+UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51217;
+UPDATE `item_template` SET `armor`=3590 WHERE `entry`=50864;
+UPDATE `item_template` SET `armor`=2658 WHERE `entry`=51132;
+UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51219;
+UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51220;
+UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51222;
+UPDATE `item_template` SET `armor`=3831 WHERE `entry`=51134;
+UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51265;
+UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51267;
+UPDATE `item_template` SET `armor`=4100 WHERE `entry`=51305;
+UPDATE `item_template` SET `armor`=2871 WHERE `entry`=51307;
+UPDATE `item_template` SET `armor`=1869 WHERE `entry`=51901;
+UPDATE `item_template` SET `armor`=649 WHERE `entry`=54801;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=42680;
+UPDATE `item_template` SET `armor`=356 WHERE `entry`=42681;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=42682;
+UPDATE `item_template` SET `armor`=331 WHERE `entry`=42683;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=42684;
+UPDATE `item_template` SET `armor`=283 WHERE `entry`=42685;
+UPDATE `item_template` SET `armor`=356 WHERE `entry`=42686;
+UPDATE `item_template` SET `armor`=400 WHERE `entry`=42687;
+UPDATE `item_template` SET `armor`=331 WHERE `entry`=42688;
+UPDATE `item_template` SET `armor`=429 WHERE `entry`=42689;
@@ -0,0 +1,30 @@
+-- NPC talk text convert from creature_ai_text. Moving boss to cpp.
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'boss_commander_sarannis' WHERE `entry`=17976;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17976;
+DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -39 AND -34;
+DELETE FROM `creature_text` WHERE `entry` IN (17976);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17976,0,0, 'Step forward! I will see that you are properly welcomed.',14,0,100,0,0,11071, 'Commander Sarannis - On Aggro Say'),
+(17976,1,0, 'Oh stop your whimpering.',14,0,100,0,0,11072, 'Commander Sarannis - On Player Death Say'),
+(17976,1,1, 'Mission accomplished.',14,0,100,0,0,11073, 'Commander Sarannis - On Player Death Say'),
+(17976,2,0, 'You are no longer dealing with some underling.',14,0,100,0,0,11076, 'Commander Sarannis - On Cast Arcane Resonance Say'),
+(17976,3,0, 'Band''or shorel''aran!',14,0,100,0,0,11077, 'Commander Sarannis - On Cast Arcane Devastation Say'),
+(17976,4,0, '%s calls for reinforcements.',16,0,100,0,0,0, 'Commander Sarannis - On HP@50% Summon emote'),
+(17976,5,0, 'Guards! Come and kill these intruders!',14,0,100,0,0,11078, 'Commander Sarannis - On HP@50% Summon Say'),
+(17976,6,0, 'I have not yet... begun to...',14,0,100,0,0,11079, 'Commander Sarannis - On Death Say');
+
+-- NPC talk text convert from creature_ai_text. Moving boss to cpp.
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'thorngrin_the_tender' WHERE `entry`=17978;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17978;
+DELETE FROM `creature_ai_texts` WHERE entry BETWEEN -16 AND -9;
+DELETE FROM `creature_text` WHERE `entry` IN (17978);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17978,0,0, 'What aggravation is this? You will die!',14,0,100,0,0,11205, 'Thorngrin the Tender - Aggro Say'),
+(17978,1,0, 'You seek a prize, eh? How about death?',14,0,100,0,0,11206, 'Thorngrin the Tender - 20% Health Say'),
+(17978,2,0, 'I hate to say I told you so...',14,0,100,0,0,11207, 'Thorngrin the Tender - Player Death Say'),
+(17978,3,0, 'Your life will be mine!',14,0,100,0,0,11208, 'Thorngrin the Tender - Cast Sacrifice Say'),
+(17978,4,0, 'I revel in your pain!',14,0,100,0,0,11209, 'Thorngrin the Tender - 50% Health Say'),
+(17978,5,0, 'I''ll incinerate you!',14,0,100,0,0,11210, 'Thorngrin the Tender - Cast Hellfire Say'),
+(17978,5,1, 'Scream while you burn!',14,0,100,0,0,11211, 'Thorngrin the Tender - Cast Hellfire Say'),
+(17978,6,0, 'You won''t... get far.',14,0,100,0,0,11212, 'Thorngrin the Tender - On Death Say'),
+(17978,7,0, '%s becomes enraged!',16,0,100,0,0,0, 'Thorngrin the Tender - On Enrage Say');
@@ -0,0 +1,7 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=32535;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(32535, 0, 0, 0x3020400, 0x1, 0, '60534');
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=32535;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUE
+(32535, 61245, 1, 0);
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=34803;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(34803,'spell_commander_sarannis_summon_reinforcements');
@@ -0,0 +1 @@
+UPDATE `instance_template` SET `script`='instance_the_botanica' WHERE `map`=553;
@@ -0,0 +1,18 @@
+-- Summoned Bloodwarder Mender SAI
+SET @ENTRY := 20083;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,63,0,100,7,0,0,0,0,11,34815,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Just Created - Cast Teleport Effect'),
+(@ENTRY,0,1,0,0,0,100,6,5000,5000,185000,185000,11,34809,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Combat - Cast Holy Fury'),
+(@ENTRY,0,2,0,0,0,100,2,8000,8000,10000,14000,11,17194,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender (Normal) - Combat - Cast Mind Blast'),
+(@ENTRY,0,3,0,0,0,100,4,8000,8000,10000,14000,11,17287,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender (Heroic) - Combat - Cast Mind Blast'),
+(@ENTRY,0,4,0,2,0,100,7,0,30,0,0,11,35096,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Bloodwarder Mender - At 30% Health - Cast Greater Heal");
+
+-- Summoned Bloodwarder Reservist SAI
+SET @ENTRY := 20078;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,63,0,100,7,0,0,0,0,11,34815,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Just Created - Cast Teleport Effect'),
+(@ENTRY,0,1,0,0,0,100,6,4000,8000,10000,12000,11,34820,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Combat - Cast Arcane Strike');
@@ -0,0 +1 @@
+DELETE FROM `creature` WHERE `id`=28318; -- Grand Apothecary Putress
@@ -0,0 +1,27 @@
+-- Add missing text and update old one
+-- Malygos
+UPDATE `creature_text` SET `probability`=100 WHERE `entry`=28859; -- Was at 0 for some reason
+UPDATE `creature_text` SET `text`='Unthinkable! The mortals will destroy... everything! My sister, what have you...',`sound`=14540 WHERE `entry`=28859 AND `groupid`=14 AND `id`=0;
+DELETE FROM `creature_text` WHERE `entry`=28859 AND `groupid` IN (15,16);
+DELETE FROM `creature_text` WHERE `entry`=30084;
+INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`probability`,`sound`,`comment`) VALUES
+(28859,15, '%s fixes his eyes on you!', 42,100,0, 'Malygos'),
+(28859,16, 'I am without limits here. The rules of your cherished reality do not apply. In this realm, I am in control!',14,100,14515, 'Malygos'),
+(30084,0, 'A Power Spark forms from a nearby rift!',41,100,14522, 'Power spark to portal');
+-- Alexstrasza, add missing sounds
+UPDATE `creature_text` SET `probability`=100,`sound`=14406 WHERE `entry`=32295 AND `groupid`=0 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14407 WHERE `entry`=32295 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14408 WHERE `entry`=32295 AND `groupid`=2 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14409 WHERE `entry`=32295 AND `groupid`=3 AND `id`=0;
+
+-- Update portal InhabitType, otherwise it falls on summon
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=30118;
+
+-- Update drakes templates
+UPDATE `creature_template` SET `unit_flags`=8,`InhabitType`=4 WHERE `entry`=30161; -- no fly aura present only enabled gravity in sniffs
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (30084,30161);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(30084,0,0,50331648,1,0,'55845'), -- Power Spark
+(30161,0,0,50331648,1,0,'60534'); -- Wyrmrest Skytalon (uses no fly aura)
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ class BIH
            tree.clear();
            objects.clear();
            // create space for the first node
-            tree.push_back(3 << 30); // dummy leaf
+            tree.push_back(3u << 30u); // dummy leaf
            tree.insert(tree.end(), 2, 0);
        }
    public:
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -311,8 +311,10 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
    }
 }

-class EventMap : private std::map<uint32, uint32>
+class EventMap
 {
+    typedef std::map<uint32, uint32> StorageType;
+
    public:
        EventMap() : _time(0), _phase(0) {}

@@ -320,13 +322,16 @@ class EventMap : private std::map<uint32, uint32>
        uint32 GetTimer() const { return _time; }

        // Removes all events and clears phase
-        void Reset() { clear(); _time = 0; _phase = 0; }
+        void Reset()
+        {
+            _eventMap.clear(); _time = 0; _phase = 0;
+        }

        void Update(uint32 time) { _time += time; }

        uint32 GetPhaseMask() const { return (_phase >> 24) & 0xFF; }

-        bool Empty() const { return empty(); }
+        bool Empty() const { return _eventMap.empty(); }

        // Sets event phase, must be in range 1 - 8
        void SetPhase(uint32 phase)
@@ -346,14 +351,14 @@ class EventMap : private std::map<uint32, uint32>
                eventId |= (1 << (groupId + 16));
            if (phase && phase < 8)
                eventId |= (1 << (phase + 24));
-            const_iterator itr = find(time);
-            while (itr != end())
+            StorageType::const_iterator itr = _eventMap.find(time);
+            while (itr != _eventMap.end())
            {
                ++time;
-                itr = find(time);
+                itr = _eventMap.find(time);
            }

-            insert(std::make_pair(time, eventId));
+            _eventMap.insert(StorageType::value_type(time, eventId));
        }

        // Removes event with specified id and creates new entry for it
@@ -366,41 +371,43 @@ class EventMap : private std::map<uint32, uint32>
        // Reschedules closest event
        void RepeatEvent(uint32 time)
        {
-            if (empty())
+            if (_eventMap.empty())
                return;

-            uint32 eventId = begin()->second;
-            erase(begin());
+            uint32 eventId = _eventMap.begin()->second;
+            _eventMap.erase(_eventMap.begin());
            time += _time;
-            const_iterator itr = find(time);
-            while (itr != end())
+            StorageType::const_iterator itr = _eventMap.find(time);
+            while (itr != _eventMap.end())
            {
                ++time;
-                itr = find(time);
+                itr = _eventMap.find(time);
            }

-            insert(std::make_pair(time, eventId));
+            _eventMap.insert(StorageType::value_type(time, eventId));
        }

        // Removes first event
        void PopEvent()
        {
-            erase(begin());
+            if (!_eventMap.empty())
+                _eventMap.erase(_eventMap.begin());
        }

        // Gets next event id to execute and removes it from map
        uint32 ExecuteEvent()
        {
-            while (!empty())
+            while (!_eventMap.empty())
            {
-                if (begin()->first > _time)
+                StorageType::iterator itr = _eventMap.begin();
+                if (itr->first > _time)
                    return 0;
-                else if (_phase && (begin()->second & 0xFF000000) && !(begin()->second & _phase))
-                    erase(begin());
+                else if (_phase && (itr->second & 0xFF000000) && !(itr->second & _phase))
+                    _eventMap.erase(itr);
                else
                {
-                    uint32 eventId = (begin()->second & 0x0000FFFF);
-                    erase(begin());
+                    uint32 eventId = (itr->second & 0x0000FFFF);
+                    _eventMap.erase(itr);
                    return eventId;
                }
            }
@@ -410,14 +417,15 @@ class EventMap : private std::map<uint32, uint32>
        // Gets next event id to execute
        uint32 GetEvent()
        {
-            while (!empty())
+            while (!_eventMap.empty())
            {
-                if (begin()->first > _time)
+                StorageType::iterator itr = _eventMap.begin();
+                if (itr->first > _time)
                    return 0;
-                else if (_phase && (begin()->second & 0xFF000000) && !(begin()->second & _phase))
-                    erase(begin());
+                else if (_phase && (itr->second & 0xFF000000) && !(itr->second & _phase))
+                    _eventMap.erase(itr);
                else
-                    return (begin()->second & 0x0000FFFF);
+                    return (itr->second & 0x0000FFFF);
            }

            return 0;
@@ -437,13 +445,13 @@ class EventMap : private std::map<uint32, uint32>
        {
            uint32 nextTime = _time + delay;
            uint32 groupMask = (1 << (groupId + 16));
-            for (iterator itr = begin(); itr != end() && itr->first < nextTime;)
+            for (StorageType::iterator itr = _eventMap.begin(); itr != _eventMap.end() && itr->first < nextTime;)
            {
                if (itr->second & groupMask)
                {
                    ScheduleEvent(itr->second, itr->first - _time + delay);
-                    erase(itr);
-                    itr = begin();
+                    _eventMap.erase(itr);
+                    itr = _eventMap.begin();
                }
                else
                    ++itr;
@@ -453,12 +461,12 @@ class EventMap : private std::map<uint32, uint32>
        // Cancel events with specified id
        void CancelEvent(uint32 eventId)
        {
-            for (iterator itr = begin(); itr != end();)
+            for (StorageType::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
            {
                if (eventId == (itr->second & 0x0000FFFF))
                {
-                    erase(itr);
-                    itr = begin();
+                    _eventMap.erase(itr);
+                    itr = _eventMap.begin();
                }
                else
                    ++itr;
@@ -470,12 +478,12 @@ class EventMap : private std::map<uint32, uint32>
        {
            uint32 groupMask = (1 << (groupId + 16));

-            for (iterator itr = begin(); itr != end();)
+            for (StorageType::iterator itr = _eventMap.begin(); itr != _eventMap.end();)
            {
                if (itr->second & groupMask)
                {
-                    erase(itr);
-                    itr = begin();
+                    _eventMap.erase(itr);
+                    itr = _eventMap.begin();
                }
                else
                    ++itr;
@@ -486,7 +494,7 @@ class EventMap : private std::map<uint32, uint32>
        // To get how much time remains substract _time
        uint32 GetNextEventTime(uint32 eventId) const
        {
-            for (const_iterator itr = begin(); itr != end(); ++itr)
+            for (StorageType::const_iterator itr = _eventMap.begin(); itr != _eventMap.end(); ++itr)
                if (eventId == (itr->second & 0x0000FFFF))
                    return itr->first;

@@ -496,6 +504,8 @@ class EventMap : private std::map<uint32, uint32>
    private:
        uint32 _time;
        uint32 _phase;
+
+        StorageType _eventMap;
 };

 enum AITarget
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+/* Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+/* Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * Thanks to the original authors: ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * This program is free software; you can redistribute it and/or modify it
				`@@ -0,0 +1 @@`
				UPDATE `instance_template` SET `script`='instance_the_botanica' WHERE `map`=553;
				`@@ -0,0 +1 @@`
				DELETE FROM `creature` WHERE `id`=28318; -- Grand Apothecary Putress