From 0250f9bf49aee02296e64de302db7615922d98e0 Mon Sep 17 00:00:00 2001
From: Drahy <none@none>
Date: Fri, 20 Feb 2009 20:28:51 +0100
Subject: [PATCH] * Updated sql files * Updated CMakeLists and
 world_script_full files

--HG--
branch : trunk
---
 ...mangos_pools.sql => 1463_mangos_7303_01_world_pools.sql} | 4 ++--
 sql/updates/{1460_mangos.sql => 1470_world_scripts.sql}     | 6 +-----
 sql/updates/CMakeLists.txt                                  | 2 ++
 sql/world_scripts_full.sql                                  | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename sql/updates/{7303_01_mangos_pools.sql => 1463_mangos_7303_01_world_pools.sql} (90%)
 rename sql/updates/{1460_mangos.sql => 1470_world_scripts.sql} (91%)

diff --git a/sql/updates/7303_01_mangos_pools.sql b/sql/updates/1463_mangos_7303_01_world_pools.sql
similarity index 90%
rename from sql/updates/7303_01_mangos_pools.sql
rename to sql/updates/1463_mangos_7303_01_world_pools.sql
index 45d4993d085..39e45679dff 100644
--- a/sql/updates/7303_01_mangos_pools.sql
+++ b/sql/updates/1463_mangos_7303_01_world_pools.sql
@@ -1,4 +1,4 @@
---ALTER TABLE db_version CHANGE COLUMN required_7292_02_mangos_locales_points_of_interest required_7303_01_mangos_pools bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7292_02_mangos_locales_points_of_interest required_7303_01_mangos_pools bit;*/
 
 DROP TABLE IF EXISTS `pool_creature`;
 CREATE TABLE `pool_creature` (
@@ -36,4 +36,4 @@ CREATE TABLE `game_event_pool` (
   `pool_entry` mediumint(8) unsigned NOT NULL default '0' COMMENT 'Id of the pool',
   `event` smallint(6) NOT NULL default '0' COMMENT 'Put negatives values to remove during event',
   PRIMARY KEY  (`pool_entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/sql/updates/1460_mangos.sql b/sql/updates/1470_world_scripts.sql
similarity index 91%
rename from sql/updates/1460_mangos.sql
rename to sql/updates/1470_world_scripts.sql
index 3c7c03de890..f0f4277fe95 100644
--- a/sql/updates/1460_mangos.sql
+++ b/sql/updates/1470_world_scripts.sql
@@ -1,8 +1,4 @@
 -- Remove script for quest 8346. Note support for this quest will be added in next ACID release(25)
 UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN (15273,15274,15294,15298,15367);
-
--- UPDATE `creature_template` SET `ScriptName`='npc_draenei_survivor' WHERE `entry`=16483;
-
 UPDATE `creature_template` SET `ScriptName`='mob_broggok_poisoncloud' WHERE `entry`=17662;
-
-
+-- UPDATE `creature_template` SET `ScriptName`='npc_draenei_survivor' WHERE `entry`=16483;
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 7f8468f5823..285677f469b 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -38,4 +38,6 @@ INSTALL(FILES
 1423_mangos_7290_01_world_command.sql
 1426_mangos_7292_01_world_points_of_interest.sql
 1426_mangos_7292_02_world_locales_points_of_interest.sql
+1463_mangos_7303_01_world_pools.sql
+1470_world_scripts.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index b9239812d73..b395924ba9d 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -390,7 +390,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_tirion_fordring' WHERE `entry`=
 UPDATE `creature_template` SET `ScriptName`='npc_henze_faulk' WHERE `entry`=6172;
 
 /* EVERSONG WOODS */
-UPDATE `creature_template` SET `ScriptName`='mobs_mana_tapped' WHERE `entry` IN (15273,15274,15294,15298,15367);
 UPDATE `creature_template` SET `ScriptName`='npc_prospector_anvilward' WHERE `entry`=15420;
 UPDATE `creature_template` SET `ScriptName`='npc_second_trial_paladin' WHERE `entry` IN (17809,17810,17811,17812);
 UPDATE `creature_template` SET `ScriptName`='npc_second_trial_controller' WHERE `entry` IN (17807);