Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

7 files changed, 610 insertions, 0 deletions

diff --git a/sql/updates/world/2012_09_14_00_world_creature_template.sql b/sql/updates/world/2012_09_14_00_world_creature_template.sql
new file mode 100644
index 00000000000..335b92e9af7
--- /dev/null
+++ b/sql/updates/world/2012_09_14_00_world_creature_template.sql
@@ -0,0 +1,287 @@
+UPDATE `creature_template` SET `lootid`=18604 WHERE `entry`=17400;
+UPDATE `creature_template` SET `lootid`=18605 WHERE `entry`=17401;
+UPDATE `creature_template` SET `lootid`=19884 WHERE `entry`=17816;
+UPDATE `creature_template` SET `lootid`=19885 WHERE `entry`=17957;
+UPDATE `creature_template` SET `lootid`=19886 WHERE `entry`=17958;
+UPDATE `creature_template` SET `lootid`=19887 WHERE `entry`=17961;
+UPDATE `creature_template` SET `lootid`=19888 WHERE `entry`=17938;
+UPDATE `creature_template` SET `lootid`=19889 WHERE `entry`=17959;
+UPDATE `creature_template` SET `lootid`=19890 WHERE `entry`=17960;
+UPDATE `creature_template` SET `lootid`=19891 WHERE `entry`=17940;
+UPDATE `creature_template` SET `lootid`=19892 WHERE `entry`=17817;
+UPDATE `creature_template` SET `lootid`=19902 WHERE `entry`=17963;
+UPDATE `creature_template` SET `lootid`=19903 WHERE `entry`=17962;
+UPDATE `creature_template` SET `lootid`=19904 WHERE `entry`=17964;
+UPDATE `creature_template` SET `lootid`=20164 WHERE `entry`=17723;
+UPDATE `creature_template` SET `lootid`=20173 WHERE `entry`=17731;
+UPDATE `creature_template` SET `lootid`=20174 WHERE `entry`=19632;
+UPDATE `creature_template` SET `lootid`=20175 WHERE `entry`=17732;
+UPDATE `creature_template` SET `lootid`=20177 WHERE `entry`=17730;
+UPDATE `creature_template` SET `lootid`=20179 WHERE `entry`=17771;
+UPDATE `creature_template` SET `lootid`=20180 WHERE `entry`=17729;
+UPDATE `creature_template` SET `lootid`=20181 WHERE `entry`=17728;
+UPDATE `creature_template` SET `lootid`=20185 WHERE `entry`=17724;
+UPDATE `creature_template` SET `lootid`=20187 WHERE `entry`=17734;
+UPDATE `creature_template` SET `lootid`=20188 WHERE `entry`=17725;
+UPDATE `creature_template` SET `lootid`=20190 WHERE `entry`=17871;
+UPDATE `creature_template` SET `lootid`=20191 WHERE `entry`=17726;
+UPDATE `creature_template` SET `lootid`=20192 WHERE `entry`=17727;
+UPDATE `creature_template` SET `lootid`=20193 WHERE `entry`=17735;
+UPDATE `creature_template` SET `lootid`=20255 WHERE `entry`=18311;
+UPDATE `creature_template` SET `lootid`=20256 WHERE `entry`=18331;
+UPDATE `creature_template` SET `lootid`=20257 WHERE `entry`=18317;
+UPDATE `creature_template` SET `lootid`=20258 WHERE `entry`=18309;
+UPDATE `creature_template` SET `lootid`=20259 WHERE `entry`=18313;
+UPDATE `creature_template` SET `lootid`=20260 WHERE `entry`=18312;
+UPDATE `creature_template` SET `lootid`=20261 WHERE `entry`=18315;
+UPDATE `creature_template` SET `lootid`=20263 WHERE `entry`=19306;
+UPDATE `creature_template` SET `lootid`=20264 WHERE `entry`=18314;
+UPDATE `creature_template` SET `lootid`=20265 WHERE `entry`=19307;
+UPDATE `creature_template` SET `lootid`=20298 WHERE `entry`=18524;
+UPDATE `creature_template` SET `lootid`=20299 WHERE `entry`=18497;
+UPDATE `creature_template` SET `lootid`=20300 WHERE `entry`=18702;
+UPDATE `creature_template` SET `lootid`=20301 WHERE `entry`=18493;
+UPDATE `creature_template` SET `lootid`=20302 WHERE `entry`=18495;
+UPDATE `creature_template` SET `lootid`=20309 WHERE `entry`=18503;
+UPDATE `creature_template` SET `lootid`=20310 WHERE `entry`=18557;
+UPDATE `creature_template` SET `lootid`=20311 WHERE `entry`=18556;
+UPDATE `creature_template` SET `lootid`=20312 WHERE `entry`=18558;
+UPDATE `creature_template` SET `lootid`=20313 WHERE `entry`=18559;
+UPDATE `creature_template` SET `lootid`=20315 WHERE `entry`=18521;
+UPDATE `creature_template` SET `lootid`=20320 WHERE `entry`=18500;
+UPDATE `creature_template` SET `lootid`=20321 WHERE `entry`=18498;
+UPDATE `creature_template` SET `lootid`=20322 WHERE `entry`=18499;
+UPDATE `creature_template` SET `lootid`=20323 WHERE `entry`=18501;
+UPDATE `creature_template` SET `lootid`=20525 WHERE `entry`=18934;
+UPDATE `creature_template` SET `lootid`=20526 WHERE `entry`=17820;
+UPDATE `creature_template` SET `lootid`=20527 WHERE `entry`=17819;
+UPDATE `creature_template` SET `lootid`=20528 WHERE `entry`=17840;
+UPDATE `creature_template` SET `lootid`=20529 WHERE `entry`=17860;
+UPDATE `creature_template` SET `lootid`=20530 WHERE `entry`=17833;
+UPDATE `creature_template` SET `lootid`=20532 WHERE `entry`=18171;
+UPDATE `creature_template` SET `lootid`=20533 WHERE `entry`=18172;
+UPDATE `creature_template` SET `lootid`=20534 WHERE `entry`=18170;
+UPDATE `creature_template` SET `lootid`=20537 WHERE `entry`=17815;
+UPDATE `creature_template` SET `lootid`=20538 WHERE `entry`=17814;
+UPDATE `creature_template` SET `lootid`=20543 WHERE `entry`=17846;
+UPDATE `creature_template` SET `lootid`=20545 WHERE `entry`=18092;
+UPDATE `creature_template` SET `lootid`=20546 WHERE `entry`=18094;
+UPDATE `creature_template` SET `lootid`=20547 WHERE `entry`=18093;
+UPDATE `creature_template` SET `lootid`=20620 WHERE `entry`=17721;
+UPDATE `creature_template` SET `lootid`=20621 WHERE `entry`=17800;
+UPDATE `creature_template` SET `lootid`=20622 WHERE `entry`=17803;
+UPDATE `creature_template` SET `lootid`=20623 WHERE `entry`=17801;
+UPDATE `creature_template` SET `lootid`=20624 WHERE `entry`=17805;
+UPDATE `creature_template` SET `lootid`=20625 WHERE `entry`=17722;
+UPDATE `creature_template` SET `lootid`=20626 WHERE `entry`=17802;
+UPDATE `creature_template` SET `lootid`=20627 WHERE `entry`=17917;
+UPDATE `creature_template` SET `lootid`=20628 WHERE `entry`=17799;
+UPDATE `creature_template` SET `lootid`=20638 WHERE `entry`=18633;
+UPDATE `creature_template` SET `lootid`=20639 WHERE `entry`=18636;
+UPDATE `creature_template` SET `lootid`=20640 WHERE `entry`=18631;
+UPDATE `creature_template` SET `lootid`=20641 WHERE `entry`=18635;
+UPDATE `creature_template` SET `lootid`=20642 WHERE `entry`=18632;
+UPDATE `creature_template` SET `lootid`=20643 WHERE `entry`=18641;
+UPDATE `creature_template` SET `lootid`=20644 WHERE `entry`=18830;
+UPDATE `creature_template` SET `lootid`=20645 WHERE `entry`=18794;
+UPDATE `creature_template` SET `lootid`=20646 WHERE `entry`=18637;
+UPDATE `creature_template` SET `lootid`=20647 WHERE `entry`=18639;
+UPDATE `creature_template` SET `lootid`=20648 WHERE `entry`=18634;
+UPDATE `creature_template` SET `lootid`=20649 WHERE `entry`=18640;
+UPDATE `creature_template` SET `lootid`=20650 WHERE `entry`=18638;
+UPDATE `creature_template` SET `lootid`=20651 WHERE `entry`=18642;
+UPDATE `creature_template` SET `lootid`=20652 WHERE `entry`=18796;
+UPDATE `creature_template` SET `lootid`=20655 WHERE `entry`=18663;
+UPDATE `creature_template` SET `lootid`=20656 WHERE `entry`=18848;
+UPDATE `creature_template` SET `lootid`=20660 WHERE `entry`=19208;
+UPDATE `creature_template` SET `lootid`=20661 WHERE `entry`=19209;
+UPDATE `creature_template` SET `lootid`=20686 WHERE `entry`=19429;
+UPDATE `creature_template` SET `lootid`=20688 WHERE `entry`=19428;
+UPDATE `creature_template` SET `lootid`=20691 WHERE `entry`=18327;
+UPDATE `creature_template` SET `lootid`=20692 WHERE `entry`=18323;
+UPDATE `creature_template` SET `lootid`=20693 WHERE `entry`=18318;
+UPDATE `creature_template` SET `lootid`=20694 WHERE `entry`=18328;
+UPDATE `creature_template` SET `lootid`=20695 WHERE `entry`=18325;
+UPDATE `creature_template` SET `lootid`=20696 WHERE `entry`=18322;
+UPDATE `creature_template` SET `lootid`=20697 WHERE `entry`=18319;
+UPDATE `creature_template` SET `lootid`=20698 WHERE `entry`=18320;
+UPDATE `creature_template` SET `lootid`=20699 WHERE `entry`=18326;
+UPDATE `creature_template` SET `lootid`=20701 WHERE `entry`=18321;
+UPDATE `creature_template` SET `lootid`=20993 WHERE `entry`=20923;
+UPDATE `creature_template` SET `lootid`=21522 WHERE `entry`=19510;
+UPDATE `creature_template` SET `lootid`=21523 WHERE `entry`=20990;
+UPDATE `creature_template` SET `lootid`=21524 WHERE `entry`=19167;
+UPDATE `creature_template` SET `lootid`=21527 WHERE `entry`=19231;
+UPDATE `creature_template` SET `lootid`=21528 WHERE `entry`=19712;
+UPDATE `creature_template` SET `lootid`=21531 WHERE `entry`=19716;
+UPDATE `creature_template` SET `lootid`=21532 WHERE `entry`=19713;
+UPDATE `creature_template` SET `lootid`=21539 WHERE `entry`=19168;
+UPDATE `creature_template` SET `lootid`=21540 WHERE `entry`=20988;
+UPDATE `creature_template` SET `lootid`=21541 WHERE `entry`=20059;
+UPDATE `creature_template` SET `lootid`=21542 WHERE `entry`=19735;
+UPDATE `creature_template` SET `lootid`=21543 WHERE `entry`=19166;
+UPDATE `creature_template` SET `lootid`=21585 WHERE `entry`=20857;
+UPDATE `creature_template` SET `lootid`=21586 WHERE `entry`=20869;
+UPDATE `creature_template` SET `lootid`=21587 WHERE `entry`=20859;
+UPDATE `creature_template` SET `lootid`=21588 WHERE `entry`=20911;
+UPDATE `creature_template` SET `lootid`=21589 WHERE `entry`=20905;
+UPDATE `creature_template` SET `lootid`=21591 WHERE `entry`=20867;
+UPDATE `creature_template` SET `lootid`=21593 WHERE `entry`=20868;
+UPDATE `creature_template` SET `lootid`=21594 WHERE `entry`=20880;
+UPDATE `creature_template` SET `lootid`=21595 WHERE `entry`=20879;
+UPDATE `creature_template` SET `lootid`=21596 WHERE `entry`=20896;
+UPDATE `creature_template` SET `lootid`=21597 WHERE `entry`=20897;
+UPDATE `creature_template` SET `lootid`=21598 WHERE `entry`=20898;
+UPDATE `creature_template` SET `lootid`=21601 WHERE `entry`=20912;
+UPDATE `creature_template` SET `lootid`=21604 WHERE `entry`=20875;
+UPDATE `creature_template` SET `lootid`=21605 WHERE `entry`=20873;
+UPDATE `creature_template` SET `lootid`=21606 WHERE `entry`=20906;
+UPDATE `creature_template` SET `lootid`=21607 WHERE `entry`=20865;
+UPDATE `creature_template` SET `lootid`=21608 WHERE `entry`=20864;
+UPDATE `creature_template` SET `lootid`=21610 WHERE `entry`=20901;
+UPDATE `creature_template` SET `lootid`=21611 WHERE `entry`=20902;
+UPDATE `creature_template` SET `lootid`=21613 WHERE `entry`=20882;
+UPDATE `creature_template` SET `lootid`=21614 WHERE `entry`=20866;
+UPDATE `creature_template` SET `lootid`=21615 WHERE `entry`=20883;
+UPDATE `creature_template` SET `lootid`=21616 WHERE `entry`=20909;
+UPDATE `creature_template` SET `lootid`=21617 WHERE `entry`=20908;
+UPDATE `creature_template` SET `lootid`=21618 WHERE `entry`=20910;
+UPDATE `creature_template` SET `lootid`=21619 WHERE `entry`=20881;
+UPDATE `creature_template` SET `lootid`=21621 WHERE `entry`=20900;
+UPDATE `creature_template` SET `lootid`=21842 WHERE `entry`=21126;
+UPDATE `creature_template` SET `lootid`=21843 WHERE `entry`=21127;
+UPDATE `creature_template` SET `lootid`=21914 WHERE `entry`=21694;
+UPDATE `creature_template` SET `lootid`=21916 WHERE `entry`=21696;
+UPDATE `creature_template` SET `lootid`=21917 WHERE `entry`=21695;
+UPDATE `creature_template` SET `lootid`=21989 WHERE `entry`=21891;
+UPDATE `creature_template` SET `lootid`=21990 WHERE `entry`=21904;
+UPDATE `creature_template` SET `lootid`=22129 WHERE `entry`=22128;
+UPDATE `creature_template` SET `lootid`=22162 WHERE `entry`=18983;
+UPDATE `creature_template` SET `lootid`=22163 WHERE `entry`=17952;
+UPDATE `creature_template` SET `lootid`=22173 WHERE `entry`=18982;
+UPDATE `creature_template` SET `lootid`=22346 WHERE `entry`=21702;
+UPDATE `creature_template` SET `lootid`=22530 WHERE `entry`=13536;
+UPDATE `creature_template` SET `lootid`=22532 WHERE `entry`=13539;
+UPDATE `creature_template` SET `lootid`=22533 WHERE `entry`=13424;
+UPDATE `creature_template` SET `lootid`=22534 WHERE `entry`=13542;
+UPDATE `creature_template` SET `lootid`=22535 WHERE `entry`=13554;
+UPDATE `creature_template` SET `lootid`=22536 WHERE `entry`=13545;
+UPDATE `creature_template` SET `lootid`=22537 WHERE `entry`=13557;
+UPDATE `creature_template` SET `lootid`=22538 WHERE `entry`=13425;
+UPDATE `creature_template` SET `lootid`=22539 WHERE `entry`=13155;
+UPDATE `creature_template` SET `lootid`=22543 WHERE `entry`=14770;
+UPDATE `creature_template` SET `lootid`=22547 WHERE `entry`=14768;
+UPDATE `creature_template` SET `lootid`=22550 WHERE `entry`=13378;
+UPDATE `creature_template` SET `lootid`=22555 WHERE `entry`=603;
+UPDATE `creature_template` SET `lootid`=22565 WHERE `entry`=13377;
+UPDATE `creature_template` SET `lootid`=22576 WHERE `entry`=13416;
+UPDATE `creature_template` SET `lootid`=22578 WHERE `entry`=13151;
+UPDATE `creature_template` SET `lootid`=22579 WHERE `entry`=14767;
+UPDATE `creature_template` SET `lootid`=22587 WHERE `entry`=13526;
+UPDATE `creature_template` SET `lootid`=22592 WHERE `entry`=13530;
+UPDATE `creature_template` SET `lootid`=22595 WHERE `entry`=14769;
+UPDATE `creature_template` SET `lootid`=22607 WHERE `entry`=13527;
+UPDATE `creature_template` SET `lootid`=22612 WHERE `entry`=13531;
+UPDATE `creature_template` SET `lootid`=22613 WHERE `entry`=13140;
+UPDATE `creature_template` SET `lootid`=22614 WHERE `entry`=13319;
+UPDATE `creature_template` SET `lootid`=22615 WHERE `entry`=13320;
+UPDATE `creature_template` SET `lootid`=22616 WHERE `entry`=13154;
+UPDATE `creature_template` SET `lootid`=22617 WHERE `entry`=13152;
+UPDATE `creature_template` SET `lootid`=22618 WHERE `entry`=13318;
+UPDATE `creature_template` SET `lootid`=22619 WHERE `entry`=13153;
+UPDATE `creature_template` SET `lootid`=22620 WHERE `entry`=13139;
+UPDATE `creature_template` SET `lootid`=22621 WHERE `entry`=13446;
+UPDATE `creature_template` SET `lootid`=22623 WHERE `entry`=13597;
+UPDATE `creature_template` SET `lootid`=22624 WHERE `entry`=13357;
+UPDATE `creature_template` SET `lootid`=22628 WHERE `entry`=13841;
+UPDATE `creature_template` SET `lootid`=22634 WHERE `entry`=13598;
+UPDATE `creature_template` SET `lootid`=22635 WHERE `entry`=13356;
+UPDATE `creature_template` SET `lootid`=22639 WHERE `entry`=13449;
+UPDATE `creature_template` SET `lootid`=22640 WHERE `entry`=13840;
+UPDATE `creature_template` SET `lootid`=22645 WHERE `entry`=12048;
+UPDATE `creature_template` SET `lootid`=22649 WHERE `entry`=12052;
+UPDATE `creature_template` SET `lootid`=22657 WHERE `entry`=12047;
+UPDATE `creature_template` SET `lootid`=22662 WHERE `entry`=13325;
+UPDATE `creature_template` SET `lootid`=22663 WHERE `entry`=13327;
+UPDATE `creature_template` SET `lootid`=22664 WHERE `entry`=13330;
+UPDATE `creature_template` SET `lootid`=22667 WHERE `entry`=13335;
+UPDATE `creature_template` SET `lootid`=22668 WHERE `entry`=13336;
+UPDATE `creature_template` SET `lootid`=22669 WHERE `entry`=13337;
+UPDATE `creature_template` SET `lootid`=22671 WHERE `entry`=13426;
+UPDATE `creature_template` SET `lootid`=22672 WHERE `entry`=13427;
+UPDATE `creature_template` SET `lootid`=22673 WHERE `entry`=13428;
+UPDATE `creature_template` SET `lootid`=22676 WHERE `entry`=13528;
+UPDATE `creature_template` SET `lootid`=22679 WHERE `entry`=13440;
+UPDATE `creature_template` SET `lootid`=22687 WHERE `entry`=13324;
+UPDATE `creature_template` SET `lootid`=22688 WHERE `entry`=13329;
+UPDATE `creature_template` SET `lootid`=22689 WHERE `entry`=13524;
+UPDATE `creature_template` SET `lootid`=22691 WHERE `entry`=13576;
+UPDATE `creature_template` SET `lootid`=22700 WHERE `entry`=13298;
+UPDATE `creature_template` SET `lootid`=22701 WHERE `entry`=13145;
+UPDATE `creature_template` SET `lootid`=22702 WHERE `entry`=13296;
+UPDATE `creature_template` SET `lootid`=22703 WHERE `entry`=13147;
+UPDATE `creature_template` SET `lootid`=22704 WHERE `entry`=13299;
+UPDATE `creature_template` SET `lootid`=22705 WHERE `entry`=13300;
+UPDATE `creature_template` SET `lootid`=22706 WHERE `entry`=13146;
+UPDATE `creature_template` SET `lootid`=22707 WHERE `entry`=13137;
+UPDATE `creature_template` SET `lootid`=22708 WHERE `entry`=13138;
+UPDATE `creature_template` SET `lootid`=22709 WHERE `entry`=13297;
+UPDATE `creature_template` SET `lootid`=22710 WHERE `entry`=13143;
+UPDATE `creature_template` SET `lootid`=22711 WHERE `entry`=13144;
+UPDATE `creature_template` SET `lootid`=22713 WHERE `entry`=13525;
+UPDATE `creature_template` SET `lootid`=22718 WHERE `entry`=13529;
+UPDATE `creature_template` SET `lootid`=22719 WHERE `entry`=13333;
+UPDATE `creature_template` SET `lootid`=22725 WHERE `entry`=10984;
+UPDATE `creature_template` SET `lootid`=22736 WHERE `entry`=13776;
+UPDATE `creature_template` SET `lootid`=22754 WHERE `entry`=13537;
+UPDATE `creature_template` SET `lootid`=22759 WHERE `entry`=13777;
+UPDATE `creature_template` SET `lootid`=22764 WHERE `entry`=13676;
+UPDATE `creature_template` SET `lootid`=22765 WHERE `entry`=13618;
+UPDATE `creature_template` SET `lootid`=22768 WHERE `entry`=13150;
+UPDATE `creature_template` SET `lootid`=22769 WHERE `entry`=13149;
+UPDATE `creature_template` SET `lootid`=22774 WHERE `entry`=13541;
+UPDATE `creature_template` SET `lootid`=22776 WHERE `entry`=13544;
+UPDATE `creature_template` SET `lootid`=22788 WHERE `entry`=12156;
+UPDATE `creature_template` SET `lootid`=22789 WHERE `entry`=12158;
+UPDATE `creature_template` SET `lootid`=22790 WHERE `entry`=13956;
+UPDATE `creature_template` SET `lootid`=22791 WHERE `entry`=13958;
+UPDATE `creature_template` SET `lootid`=22792 WHERE `entry`=12157;
+UPDATE `creature_template` SET `lootid`=22794 WHERE `entry`=10983;
+UPDATE `creature_template` SET `lootid`=22795 WHERE `entry`=13957;
+UPDATE `creature_template` SET `lootid`=22796 WHERE `entry`=11679;
+UPDATE `creature_template` SET `lootid`=25548 WHERE `entry`=24976;
+UPDATE `creature_template` SET `lootid`=25551 WHERE `entry`=24698;
+UPDATE `creature_template` SET `lootid`=29274 WHERE `entry`=16506;
+UPDATE `creature_template` SET `lootid`=29833 WHERE `entry`=16156;
+UPDATE `creature_template` SET `lootid`=30759 WHERE `entry`=22262;
+UPDATE `creature_template` SET `lootid`=30760 WHERE `entry`=22261;
+UPDATE `creature_template` SET `lootid`=30761 WHERE `entry`=22263;
+UPDATE `creature_template` SET `lootid`=30763 WHERE `entry`=23174;
+UPDATE `creature_template` SET `lootid`=30773 WHERE `entry`=23386;
+UPDATE `creature_template` SET `lootid`=30822 WHERE `entry`=26690;
+UPDATE `creature_template` SET `lootid`=30823 WHERE `entry`=26691;
+UPDATE `creature_template` SET `lootid`=31178 WHERE `entry`=27729;
+UPDATE `creature_template` SET `lootid`=31179 WHERE `entry`=28249;
+UPDATE `creature_template` SET `lootid`=31180 WHERE `entry`=27732;
+UPDATE `creature_template` SET `lootid`=31184 WHERE `entry`=28200;
+UPDATE `creature_template` SET `lootid`=31187 WHERE `entry`=27734;
+UPDATE `creature_template` SET `lootid`=31188 WHERE `entry`=28199;
+UPDATE `creature_template` SET `lootid`=31199 WHERE `entry`=27736;
+UPDATE `creature_template` SET `lootid`=31200 WHERE `entry`=28201;
+UPDATE `creature_template` SET `lootid`=31201 WHERE `entry`=27731;
+UPDATE `creature_template` SET `lootid`=31202 WHERE `entry`=27742;
+UPDATE `creature_template` SET `lootid`=31203 WHERE `entry`=27744;
+UPDATE `creature_template` SET `lootid`=31206 WHERE `entry`=27743;
+UPDATE `creature_template` SET `lootid`=33391 WHERE `entry`=32915;
+UPDATE `creature_template` SET `lootid`=33773 WHERE `entry`=33772;
+UPDATE `creature_template` SET `lootid`=34106 WHERE `entry`=33432;
+UPDATE `creature_template` SET `lootid`=34108 WHERE `entry`=33651;
+UPDATE `creature_template` SET `lootid`=35306 WHERE `entry`=35305;
+UPDATE `creature_template` SET `lootid`=35308 WHERE `entry`=35307;
+UPDATE `creature_template` SET `lootid`=35310 WHERE `entry`=35309;
+UPDATE `creature_template` SET `lootid`=35359 WHERE `entry`=35143;
+UPDATE `creature_template` SET `lootid`=38151 WHERE `entry`=37532;
+UPDATE `creature_template` SET `lootid`=39805 WHERE `entry`=39946;
+UPDATE `creature_template` SET `lootid`=39823 WHERE `entry`=39948;
+UPDATE `creature_template` SET `lootid`=39920 WHERE `entry`=39947;
+UPDATE `creature_template` SET `lootid`=40420 WHERE `entry`=40419;
diff --git a/sql/updates/world/2012_09_14_00_world_sai.sql b/sql/updates/world/2012_09_14_00_world_sai.sql
new file mode 100644
index 00000000000..13f11b7a795
--- /dev/null
+++ b/sql/updates/world/2012_09_14_00_world_sai.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `event_param1` = 35282, `action_param1` = 256, `comment` = 'Scrapped Fel Reaver - On Spellhit - Remove - OOC Not attackable - flags'  WHERE `entryorguid` = 20243;
diff --git a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql b/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..77ab9e89b04
--- /dev/null
+++ b/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
@@ -0,0 +1,5 @@
+DELETE FROM `creature_loot_template` WHERE `entry` = 37126;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(37126, 49426, 100, 1, 0, 1, 1),
+(37126, 1, 100, 1, 0, -100002, 1);
+UPDATE `creature_template` SET `lootid` = 37126 WHERE `entry` IN (37126,38258);
diff --git a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..a30eff7024e
--- /dev/null
+++ b/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+-- Insert achievement instance criteria data scripts
+DELETE FROM `achievement_criteria_data` WHERE `type`=11 and `criteria_id` IN (7323,7324,7325);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(7323,11,0,0,'achievement_ruby_void'),
+(7324,11,0,0,'achievement_emerald_void'),
+(7325,11,0,0,'achievement_amber_void');
diff --git a/sql/updates/world/2012_09_15_00_world_creature_template.sql b/sql/updates/world/2012_09_15_00_world_creature_template.sql
new file mode 100644
index 00000000000..3db5a598c1d
--- /dev/null
+++ b/sql/updates/world/2012_09_15_00_world_creature_template.sql
@@ -0,0 +1,288 @@
+UPDATE `creature_template` SET `lootid`=`entry` WHERE `entry` IN (17400,17401,17816,17957,17958,17961,17938,17959,17960,17940,17817,17963,17962,17964,17723,17731,19632,17732,17730,17771,17729,17728,17724,17734,17725,17871,17726,17727,17735,18311,18331,18317,18309,18313,18312,18315,19306,18314,19307,18524,18497,18702,18493,18495,18503,18557,18556,18558,18559,18521,18500,18498,18499,18501,18934,17820,17819,17840,17860,17833,18171,18172,18170,17815,17814,17846,18092,18094,18093,17721,17800,17803,17801,17805,17722,17802,17917,17799,18633,18636,18631,18635,18632,18641,18830,18794,18637,18639,18634,18640,18638,18642,18796,18663,18848,19208,19209,19429,19428,18327,18323,18318,18328,18325,18322,18319,18320,18326,18321,20923,19510,20990,19167,19231,19712,19716,19713,19168,20988,20059,19735,19166,20857,20869,20859,20911,20905,20867,20868,20880,20879,20896,20897,20898,20912,20875,20873,20906,20865,20864,20901,20902,20882,20866,20883,20909,20908,20910,20881,20900,21126,21127,21694,21696,21695,21891,21904,22128,18983,17952,18982,21702,13536,13539,13424,13542,13554,13545,13557,13425,13155,14770,14768,13378,603,13377,13416,13151,14767,13526,13530,14769,13527,13531,13140,13319,13320,13154,13152,13318,13153,13139,13446,13597,13357,13841,13598,13356,13449,13840,12048,12052,12047,13325,13327,13330,13335,13336,13337,13426,13427,13428,13528,13440,13324,13329,13524,13576,13298,13145,13296,13147,13299,13300,13146,13137,13138,13297,13143,13144,13525,13529,13333,10984,13776,13537,13777,13676,13618,13150,13149,13541,13544,12156,12158,13956,13958,12157,10983,13957,11679,24976,24698,16506,16156,22262,22261,22263,23174,23386,26690,26691,27729,28249,27732,28200,27734,28199,27736,28201,27731,27742,27744,27743,32915,33772,33432,33651,35305,35307,35309,35143,37532,39946,39948,39947,40419);
+UPDATE `creature_template` SET `lootid`=17400 WHERE `entry`=18604;
+UPDATE `creature_template` SET `lootid`=17401 WHERE `entry`=18605;
+UPDATE `creature_template` SET `lootid`=17816 WHERE `entry`=19884;
+UPDATE `creature_template` SET `lootid`=17957 WHERE `entry`=19885;
+UPDATE `creature_template` SET `lootid`=17958 WHERE `entry`=19886;
+UPDATE `creature_template` SET `lootid`=17961 WHERE `entry`=19887;
+UPDATE `creature_template` SET `lootid`=17938 WHERE `entry`=19888;
+UPDATE `creature_template` SET `lootid`=17959 WHERE `entry`=19889;
+UPDATE `creature_template` SET `lootid`=17960 WHERE `entry`=19890;
+UPDATE `creature_template` SET `lootid`=17940 WHERE `entry`=19891;
+UPDATE `creature_template` SET `lootid`=17817 WHERE `entry`=19892;
+UPDATE `creature_template` SET `lootid`=17963 WHERE `entry`=19902;
+UPDATE `creature_template` SET `lootid`=17962 WHERE `entry`=19903;
+UPDATE `creature_template` SET `lootid`=17964 WHERE `entry`=19904;
+UPDATE `creature_template` SET `lootid`=17723 WHERE `entry`=20164;
+UPDATE `creature_template` SET `lootid`=17731 WHERE `entry`=20173;
+UPDATE `creature_template` SET `lootid`=19632 WHERE `entry`=20174;
+UPDATE `creature_template` SET `lootid`=17732 WHERE `entry`=20175;
+UPDATE `creature_template` SET `lootid`=17730 WHERE `entry`=20177;
+UPDATE `creature_template` SET `lootid`=17771 WHERE `entry`=20179;
+UPDATE `creature_template` SET `lootid`=17729 WHERE `entry`=20180;
+UPDATE `creature_template` SET `lootid`=17728 WHERE `entry`=20181;
+UPDATE `creature_template` SET `lootid`=17724 WHERE `entry`=20185;
+UPDATE `creature_template` SET `lootid`=17734 WHERE `entry`=20187;
+UPDATE `creature_template` SET `lootid`=17725 WHERE `entry`=20188;
+UPDATE `creature_template` SET `lootid`=17871 WHERE `entry`=20190;
+UPDATE `creature_template` SET `lootid`=17726 WHERE `entry`=20191;
+UPDATE `creature_template` SET `lootid`=17727 WHERE `entry`=20192;
+UPDATE `creature_template` SET `lootid`=17735 WHERE `entry`=20193;
+UPDATE `creature_template` SET `lootid`=18311 WHERE `entry`=20255;
+UPDATE `creature_template` SET `lootid`=18331 WHERE `entry`=20256;
+UPDATE `creature_template` SET `lootid`=18317 WHERE `entry`=20257;
+UPDATE `creature_template` SET `lootid`=18309 WHERE `entry`=20258;
+UPDATE `creature_template` SET `lootid`=18313 WHERE `entry`=20259;
+UPDATE `creature_template` SET `lootid`=18312 WHERE `entry`=20260;
+UPDATE `creature_template` SET `lootid`=18315 WHERE `entry`=20261;
+UPDATE `creature_template` SET `lootid`=19306 WHERE `entry`=20263;
+UPDATE `creature_template` SET `lootid`=18314 WHERE `entry`=20264;
+UPDATE `creature_template` SET `lootid`=19307 WHERE `entry`=20265;
+UPDATE `creature_template` SET `lootid`=18524 WHERE `entry`=20298;
+UPDATE `creature_template` SET `lootid`=18497 WHERE `entry`=20299;
+UPDATE `creature_template` SET `lootid`=18702 WHERE `entry`=20300;
+UPDATE `creature_template` SET `lootid`=18493 WHERE `entry`=20301;
+UPDATE `creature_template` SET `lootid`=18495 WHERE `entry`=20302;
+UPDATE `creature_template` SET `lootid`=18503 WHERE `entry`=20309;
+UPDATE `creature_template` SET `lootid`=18557 WHERE `entry`=20310;
+UPDATE `creature_template` SET `lootid`=18556 WHERE `entry`=20311;
+UPDATE `creature_template` SET `lootid`=18558 WHERE `entry`=20312;
+UPDATE `creature_template` SET `lootid`=18559 WHERE `entry`=20313;
+UPDATE `creature_template` SET `lootid`=18521 WHERE `entry`=20315;
+UPDATE `creature_template` SET `lootid`=18500 WHERE `entry`=20320;
+UPDATE `creature_template` SET `lootid`=18498 WHERE `entry`=20321;
+UPDATE `creature_template` SET `lootid`=18499 WHERE `entry`=20322;
+UPDATE `creature_template` SET `lootid`=18501 WHERE `entry`=20323;
+UPDATE `creature_template` SET `lootid`=18934 WHERE `entry`=20525;
+UPDATE `creature_template` SET `lootid`=17820 WHERE `entry`=20526;
+UPDATE `creature_template` SET `lootid`=17819 WHERE `entry`=20527;
+UPDATE `creature_template` SET `lootid`=17840 WHERE `entry`=20528;
+UPDATE `creature_template` SET `lootid`=17860 WHERE `entry`=20529;
+UPDATE `creature_template` SET `lootid`=17833 WHERE `entry`=20530;
+UPDATE `creature_template` SET `lootid`=18171 WHERE `entry`=20532;
+UPDATE `creature_template` SET `lootid`=18172 WHERE `entry`=20533;
+UPDATE `creature_template` SET `lootid`=18170 WHERE `entry`=20534;
+UPDATE `creature_template` SET `lootid`=17815 WHERE `entry`=20537;
+UPDATE `creature_template` SET `lootid`=17814 WHERE `entry`=20538;
+UPDATE `creature_template` SET `lootid`=17846 WHERE `entry`=20543;
+UPDATE `creature_template` SET `lootid`=18092 WHERE `entry`=20545;
+UPDATE `creature_template` SET `lootid`=18094 WHERE `entry`=20546;
+UPDATE `creature_template` SET `lootid`=18093 WHERE `entry`=20547;
+UPDATE `creature_template` SET `lootid`=17721 WHERE `entry`=20620;
+UPDATE `creature_template` SET `lootid`=17800 WHERE `entry`=20621;
+UPDATE `creature_template` SET `lootid`=17803 WHERE `entry`=20622;
+UPDATE `creature_template` SET `lootid`=17801 WHERE `entry`=20623;
+UPDATE `creature_template` SET `lootid`=17805 WHERE `entry`=20624;
+UPDATE `creature_template` SET `lootid`=17722 WHERE `entry`=20625;
+UPDATE `creature_template` SET `lootid`=17802 WHERE `entry`=20626;
+UPDATE `creature_template` SET `lootid`=17917 WHERE `entry`=20627;
+UPDATE `creature_template` SET `lootid`=17799 WHERE `entry`=20628;
+UPDATE `creature_template` SET `lootid`=18633 WHERE `entry`=20638;
+UPDATE `creature_template` SET `lootid`=18636 WHERE `entry`=20639;
+UPDATE `creature_template` SET `lootid`=18631 WHERE `entry`=20640;
+UPDATE `creature_template` SET `lootid`=18635 WHERE `entry`=20641;
+UPDATE `creature_template` SET `lootid`=18632 WHERE `entry`=20642;
+UPDATE `creature_template` SET `lootid`=18641 WHERE `entry`=20643;
+UPDATE `creature_template` SET `lootid`=18830 WHERE `entry`=20644;
+UPDATE `creature_template` SET `lootid`=18794 WHERE `entry`=20645;
+UPDATE `creature_template` SET `lootid`=18637 WHERE `entry`=20646;
+UPDATE `creature_template` SET `lootid`=18639 WHERE `entry`=20647;
+UPDATE `creature_template` SET `lootid`=18634 WHERE `entry`=20648;
+UPDATE `creature_template` SET `lootid`=18640 WHERE `entry`=20649;
+UPDATE `creature_template` SET `lootid`=18638 WHERE `entry`=20650;
+UPDATE `creature_template` SET `lootid`=18642 WHERE `entry`=20651;
+UPDATE `creature_template` SET `lootid`=18796 WHERE `entry`=20652;
+UPDATE `creature_template` SET `lootid`=18663 WHERE `entry`=20655;
+UPDATE `creature_template` SET `lootid`=18848 WHERE `entry`=20656;
+UPDATE `creature_template` SET `lootid`=19208 WHERE `entry`=20660;
+UPDATE `creature_template` SET `lootid`=19209 WHERE `entry`=20661;
+UPDATE `creature_template` SET `lootid`=19429 WHERE `entry`=20686;
+UPDATE `creature_template` SET `lootid`=19428 WHERE `entry`=20688;
+UPDATE `creature_template` SET `lootid`=18327 WHERE `entry`=20691;
+UPDATE `creature_template` SET `lootid`=18323 WHERE `entry`=20692;
+UPDATE `creature_template` SET `lootid`=18318 WHERE `entry`=20693;
+UPDATE `creature_template` SET `lootid`=18328 WHERE `entry`=20694;
+UPDATE `creature_template` SET `lootid`=18325 WHERE `entry`=20695;
+UPDATE `creature_template` SET `lootid`=18322 WHERE `entry`=20696;
+UPDATE `creature_template` SET `lootid`=18319 WHERE `entry`=20697;
+UPDATE `creature_template` SET `lootid`=18320 WHERE `entry`=20698;
+UPDATE `creature_template` SET `lootid`=18326 WHERE `entry`=20699;
+UPDATE `creature_template` SET `lootid`=18321 WHERE `entry`=20701;
+UPDATE `creature_template` SET `lootid`=20923 WHERE `entry`=20993;
+UPDATE `creature_template` SET `lootid`=19510 WHERE `entry`=21522;
+UPDATE `creature_template` SET `lootid`=20990 WHERE `entry`=21523;
+UPDATE `creature_template` SET `lootid`=19167 WHERE `entry`=21524;
+UPDATE `creature_template` SET `lootid`=19231 WHERE `entry`=21527;
+UPDATE `creature_template` SET `lootid`=19712 WHERE `entry`=21528;
+UPDATE `creature_template` SET `lootid`=19716 WHERE `entry`=21531;
+UPDATE `creature_template` SET `lootid`=19713 WHERE `entry`=21532;
+UPDATE `creature_template` SET `lootid`=19168 WHERE `entry`=21539;
+UPDATE `creature_template` SET `lootid`=20988 WHERE `entry`=21540;
+UPDATE `creature_template` SET `lootid`=20059 WHERE `entry`=21541;
+UPDATE `creature_template` SET `lootid`=19735 WHERE `entry`=21542;
+UPDATE `creature_template` SET `lootid`=19166 WHERE `entry`=21543;
+UPDATE `creature_template` SET `lootid`=20857 WHERE `entry`=21585;
+UPDATE `creature_template` SET `lootid`=20869 WHERE `entry`=21586;
+UPDATE `creature_template` SET `lootid`=20859 WHERE `entry`=21587;
+UPDATE `creature_template` SET `lootid`=20911 WHERE `entry`=21588;
+UPDATE `creature_template` SET `lootid`=20905 WHERE `entry`=21589;
+UPDATE `creature_template` SET `lootid`=20867 WHERE `entry`=21591;
+UPDATE `creature_template` SET `lootid`=20868 WHERE `entry`=21593;
+UPDATE `creature_template` SET `lootid`=20880 WHERE `entry`=21594;
+UPDATE `creature_template` SET `lootid`=20879 WHERE `entry`=21595;
+UPDATE `creature_template` SET `lootid`=20896 WHERE `entry`=21596;
+UPDATE `creature_template` SET `lootid`=20897 WHERE `entry`=21597;
+UPDATE `creature_template` SET `lootid`=20898 WHERE `entry`=21598;
+UPDATE `creature_template` SET `lootid`=20912 WHERE `entry`=21601;
+UPDATE `creature_template` SET `lootid`=20875 WHERE `entry`=21604;
+UPDATE `creature_template` SET `lootid`=20873 WHERE `entry`=21605;
+UPDATE `creature_template` SET `lootid`=20906 WHERE `entry`=21606;
+UPDATE `creature_template` SET `lootid`=20865 WHERE `entry`=21607;
+UPDATE `creature_template` SET `lootid`=20864 WHERE `entry`=21608;
+UPDATE `creature_template` SET `lootid`=20901 WHERE `entry`=21610;
+UPDATE `creature_template` SET `lootid`=20902 WHERE `entry`=21611;
+UPDATE `creature_template` SET `lootid`=20882 WHERE `entry`=21613;
+UPDATE `creature_template` SET `lootid`=20866 WHERE `entry`=21614;
+UPDATE `creature_template` SET `lootid`=20883 WHERE `entry`=21615;
+UPDATE `creature_template` SET `lootid`=20909 WHERE `entry`=21616;
+UPDATE `creature_template` SET `lootid`=20908 WHERE `entry`=21617;
+UPDATE `creature_template` SET `lootid`=20910 WHERE `entry`=21618;
+UPDATE `creature_template` SET `lootid`=20881 WHERE `entry`=21619;
+UPDATE `creature_template` SET `lootid`=20900 WHERE `entry`=21621;
+UPDATE `creature_template` SET `lootid`=21126 WHERE `entry`=21842;
+UPDATE `creature_template` SET `lootid`=21127 WHERE `entry`=21843;
+UPDATE `creature_template` SET `lootid`=21694 WHERE `entry`=21914;
+UPDATE `creature_template` SET `lootid`=21696 WHERE `entry`=21916;
+UPDATE `creature_template` SET `lootid`=21695 WHERE `entry`=21917;
+UPDATE `creature_template` SET `lootid`=21891 WHERE `entry`=21989;
+UPDATE `creature_template` SET `lootid`=21904 WHERE `entry`=21990;
+UPDATE `creature_template` SET `lootid`=22128 WHERE `entry`=22129;
+UPDATE `creature_template` SET `lootid`=18983 WHERE `entry`=22162;
+UPDATE `creature_template` SET `lootid`=17952 WHERE `entry`=22163;
+UPDATE `creature_template` SET `lootid`=18982 WHERE `entry`=22173;
+UPDATE `creature_template` SET `lootid`=21702 WHERE `entry`=22346;
+UPDATE `creature_template` SET `lootid`=13536 WHERE `entry`=22530;
+UPDATE `creature_template` SET `lootid`=13539 WHERE `entry`=22532;
+UPDATE `creature_template` SET `lootid`=13424 WHERE `entry`=22533;
+UPDATE `creature_template` SET `lootid`=13542 WHERE `entry`=22534;
+UPDATE `creature_template` SET `lootid`=13554 WHERE `entry`=22535;
+UPDATE `creature_template` SET `lootid`=13545 WHERE `entry`=22536;
+UPDATE `creature_template` SET `lootid`=13557 WHERE `entry`=22537;
+UPDATE `creature_template` SET `lootid`=13425 WHERE `entry`=22538;
+UPDATE `creature_template` SET `lootid`=13155 WHERE `entry`=22539;
+UPDATE `creature_template` SET `lootid`=14770 WHERE `entry`=22543;
+UPDATE `creature_template` SET `lootid`=14768 WHERE `entry`=22547;
+UPDATE `creature_template` SET `lootid`=13378 WHERE `entry`=22550;
+UPDATE `creature_template` SET `lootid`=603 WHERE `entry`=22555;
+UPDATE `creature_template` SET `lootid`=13377 WHERE `entry`=22565;
+UPDATE `creature_template` SET `lootid`=13416 WHERE `entry`=22576;
+UPDATE `creature_template` SET `lootid`=13151 WHERE `entry`=22578;
+UPDATE `creature_template` SET `lootid`=14767 WHERE `entry`=22579;
+UPDATE `creature_template` SET `lootid`=13526 WHERE `entry`=22587;
+UPDATE `creature_template` SET `lootid`=13530 WHERE `entry`=22592;
+UPDATE `creature_template` SET `lootid`=14769 WHERE `entry`=22595;
+UPDATE `creature_template` SET `lootid`=13527 WHERE `entry`=22607;
+UPDATE `creature_template` SET `lootid`=13531 WHERE `entry`=22612;
+UPDATE `creature_template` SET `lootid`=13140 WHERE `entry`=22613;
+UPDATE `creature_template` SET `lootid`=13319 WHERE `entry`=22614;
+UPDATE `creature_template` SET `lootid`=13320 WHERE `entry`=22615;
+UPDATE `creature_template` SET `lootid`=13154 WHERE `entry`=22616;
+UPDATE `creature_template` SET `lootid`=13152 WHERE `entry`=22617;
+UPDATE `creature_template` SET `lootid`=13318 WHERE `entry`=22618;
+UPDATE `creature_template` SET `lootid`=13153 WHERE `entry`=22619;
+UPDATE `creature_template` SET `lootid`=13139 WHERE `entry`=22620;
+UPDATE `creature_template` SET `lootid`=13446 WHERE `entry`=22621;
+UPDATE `creature_template` SET `lootid`=13597 WHERE `entry`=22623;
+UPDATE `creature_template` SET `lootid`=13357 WHERE `entry`=22624;
+UPDATE `creature_template` SET `lootid`=13841 WHERE `entry`=22628;
+UPDATE `creature_template` SET `lootid`=13598 WHERE `entry`=22634;
+UPDATE `creature_template` SET `lootid`=13356 WHERE `entry`=22635;
+UPDATE `creature_template` SET `lootid`=13449 WHERE `entry`=22639;
+UPDATE `creature_template` SET `lootid`=13840 WHERE `entry`=22640;
+UPDATE `creature_template` SET `lootid`=12048 WHERE `entry`=22645;
+UPDATE `creature_template` SET `lootid`=12052 WHERE `entry`=22649;
+UPDATE `creature_template` SET `lootid`=12047 WHERE `entry`=22657;
+UPDATE `creature_template` SET `lootid`=13325 WHERE `entry`=22662;
+UPDATE `creature_template` SET `lootid`=13327 WHERE `entry`=22663;
+UPDATE `creature_template` SET `lootid`=13330 WHERE `entry`=22664;
+UPDATE `creature_template` SET `lootid`=13335 WHERE `entry`=22667;
+UPDATE `creature_template` SET `lootid`=13336 WHERE `entry`=22668;
+UPDATE `creature_template` SET `lootid`=13337 WHERE `entry`=22669;
+UPDATE `creature_template` SET `lootid`=13426 WHERE `entry`=22671;
+UPDATE `creature_template` SET `lootid`=13427 WHERE `entry`=22672;
+UPDATE `creature_template` SET `lootid`=13428 WHERE `entry`=22673;
+UPDATE `creature_template` SET `lootid`=13528 WHERE `entry`=22676;
+UPDATE `creature_template` SET `lootid`=13440 WHERE `entry`=22679;
+UPDATE `creature_template` SET `lootid`=13324 WHERE `entry`=22687;
+UPDATE `creature_template` SET `lootid`=13329 WHERE `entry`=22688;
+UPDATE `creature_template` SET `lootid`=13524 WHERE `entry`=22689;
+UPDATE `creature_template` SET `lootid`=13576 WHERE `entry`=22691;
+UPDATE `creature_template` SET `lootid`=13298 WHERE `entry`=22700;
+UPDATE `creature_template` SET `lootid`=13145 WHERE `entry`=22701;
+UPDATE `creature_template` SET `lootid`=13296 WHERE `entry`=22702;
+UPDATE `creature_template` SET `lootid`=13147 WHERE `entry`=22703;
+UPDATE `creature_template` SET `lootid`=13299 WHERE `entry`=22704;
+UPDATE `creature_template` SET `lootid`=13300 WHERE `entry`=22705;
+UPDATE `creature_template` SET `lootid`=13146 WHERE `entry`=22706;
+UPDATE `creature_template` SET `lootid`=13137 WHERE `entry`=22707;
+UPDATE `creature_template` SET `lootid`=13138 WHERE `entry`=22708;
+UPDATE `creature_template` SET `lootid`=13297 WHERE `entry`=22709;
+UPDATE `creature_template` SET `lootid`=13143 WHERE `entry`=22710;
+UPDATE `creature_template` SET `lootid`=13144 WHERE `entry`=22711;
+UPDATE `creature_template` SET `lootid`=13525 WHERE `entry`=22713;
+UPDATE `creature_template` SET `lootid`=13529 WHERE `entry`=22718;
+UPDATE `creature_template` SET `lootid`=13333 WHERE `entry`=22719;
+UPDATE `creature_template` SET `lootid`=10984 WHERE `entry`=22725;
+UPDATE `creature_template` SET `lootid`=13776 WHERE `entry`=22736;
+UPDATE `creature_template` SET `lootid`=13537 WHERE `entry`=22754;
+UPDATE `creature_template` SET `lootid`=13777 WHERE `entry`=22759;
+UPDATE `creature_template` SET `lootid`=13676 WHERE `entry`=22764;
+UPDATE `creature_template` SET `lootid`=13618 WHERE `entry`=22765;
+UPDATE `creature_template` SET `lootid`=13150 WHERE `entry`=22768;
+UPDATE `creature_template` SET `lootid`=13149 WHERE `entry`=22769;
+UPDATE `creature_template` SET `lootid`=13541 WHERE `entry`=22774;
+UPDATE `creature_template` SET `lootid`=13544 WHERE `entry`=22776;
+UPDATE `creature_template` SET `lootid`=12156 WHERE `entry`=22788;
+UPDATE `creature_template` SET `lootid`=12158 WHERE `entry`=22789;
+UPDATE `creature_template` SET `lootid`=13956 WHERE `entry`=22790;
+UPDATE `creature_template` SET `lootid`=13958 WHERE `entry`=22791;
+UPDATE `creature_template` SET `lootid`=12157 WHERE `entry`=22792;
+UPDATE `creature_template` SET `lootid`=10983 WHERE `entry`=22794;
+UPDATE `creature_template` SET `lootid`=13957 WHERE `entry`=22795;
+UPDATE `creature_template` SET `lootid`=11679 WHERE `entry`=22796;
+UPDATE `creature_template` SET `lootid`=24976 WHERE `entry`=25548;
+UPDATE `creature_template` SET `lootid`=24698 WHERE `entry`=25551;
+UPDATE `creature_template` SET `lootid`=16506 WHERE `entry`=29274;
+UPDATE `creature_template` SET `lootid`=16156 WHERE `entry`=29833;
+UPDATE `creature_template` SET `lootid`=22262 WHERE `entry`=30759;
+UPDATE `creature_template` SET `lootid`=22261 WHERE `entry`=30760;
+UPDATE `creature_template` SET `lootid`=22263 WHERE `entry`=30761;
+UPDATE `creature_template` SET `lootid`=23174 WHERE `entry`=30763;
+UPDATE `creature_template` SET `lootid`=23386 WHERE `entry`=30773;
+UPDATE `creature_template` SET `lootid`=26690 WHERE `entry`=30822;
+UPDATE `creature_template` SET `lootid`=26691 WHERE `entry`=30823;
+UPDATE `creature_template` SET `lootid`=27729 WHERE `entry`=31178;
+UPDATE `creature_template` SET `lootid`=28249 WHERE `entry`=31179;
+UPDATE `creature_template` SET `lootid`=27732 WHERE `entry`=31180;
+UPDATE `creature_template` SET `lootid`=28200 WHERE `entry`=31184;
+UPDATE `creature_template` SET `lootid`=27734 WHERE `entry`=31187;
+UPDATE `creature_template` SET `lootid`=28199 WHERE `entry`=31188;
+UPDATE `creature_template` SET `lootid`=27736 WHERE `entry`=31199;
+UPDATE `creature_template` SET `lootid`=28201 WHERE `entry`=31200;
+UPDATE `creature_template` SET `lootid`=27731 WHERE `entry`=31201;
+UPDATE `creature_template` SET `lootid`=27742 WHERE `entry`=31202;
+UPDATE `creature_template` SET `lootid`=27744 WHERE `entry`=31203;
+UPDATE `creature_template` SET `lootid`=27743 WHERE `entry`=31206;
+UPDATE `creature_template` SET `lootid`=32915 WHERE `entry`=33391;
+UPDATE `creature_template` SET `lootid`=33772 WHERE `entry`=33773;
+UPDATE `creature_template` SET `lootid`=33432 WHERE `entry`=34106;
+UPDATE `creature_template` SET `lootid`=33651 WHERE `entry`=34108;
+UPDATE `creature_template` SET `lootid`=35305 WHERE `entry`=35306;
+UPDATE `creature_template` SET `lootid`=35307 WHERE `entry`=35308;
+UPDATE `creature_template` SET `lootid`=35309 WHERE `entry`=35310;
+UPDATE `creature_template` SET `lootid`=35143 WHERE `entry`=35359;
+UPDATE `creature_template` SET `lootid`=37532 WHERE `entry`=38151;
+UPDATE `creature_template` SET `lootid`=39946 WHERE `entry`=39805;
+UPDATE `creature_template` SET `lootid`=39948 WHERE `entry`=39823;
+UPDATE `creature_template` SET `lootid`=39947 WHERE `entry`=39920;
+UPDATE `creature_template` SET `lootid`=40419 WHERE `entry`=40420;
diff --git a/sql/updates/world/2012_09_15_00_world_disables.sql b/sql/updates/world/2012_09_15_00_world_disables.sql
new file mode 100644
index 00000000000..371315b5be7
--- /dev/null
+++ b/sql/updates/world/2012_09_15_00_world_disables.sql
@@ -0,0 +1,4 @@
+-- Remove achievements from disables
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7323; -- Ruby Void
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7324; -- Emerald Void
+DELETE FROM `disables` WHERE  `sourceType`=4 AND `entry`=7325; -- Amber Void
diff --git a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql b/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..71068d95bde
--- /dev/null
+++ b/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
@@ -0,0 +1,19 @@
+SET @SisterSvalna := 37126; -- Sister Svalna
+
+CALL `sp_get_ref_id`('RAID_CRE',@Reference);
+SET @RefSisterSvalna := @Reference+1;
+
+DELETE FROM `creature_loot_template` WHERE `entry`=@SisterSvalna;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@SisterSvalna,49426,100,1,0,1,1),-- Sister Svalna dropping 1 Emblem of Frost
+(@SisterSvalna,1,100,1,0,-@RefSisterSvalna,1);
+
+DELETE FROM `reference_loot_template` WHERE `entry`=@RefSisterSvalna;
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@RefSisterSvalna,50452,6,1,1,1,1), -- Wodin's Lucky Necklace
+(@RefSisterSvalna,50453,5,1,1,1,1); -- Ring of Rotting Sinew
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=@RefSisterSvalna;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(10,@RefSisterSvalna,50452,0,0,19,0,3,0,0,0,0,'', 'Wodin''s Lucky Necklace only 25 heroic'),
+(10,@RefSisterSvalna,50453,0,0,19,0,3,0,0,0,0,'', 'Ring of Rotting Sinew only 25 heroic');