Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
This commit is contained in:
Nay
2012-09-08 01:34:24 +01:00
parent eda5c3a9bf 4cf1e7309f
commit 242a2fdbc1
18 changed files with 132 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/characters/2012_09_07_00_characters_characters.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `characters` MODIFY `name`
VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;

1
sql/updates/world/2012_09_07_01_world_creature_template.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `creature_template` SET `unit_flags2`=`unit_flags2`|0x800; -- UNIT_FLAG2_REGENERATE_POWER

3
sql/updates/world/2012_09_07_02_world_spell_script_names.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM spell_script_names WHERE spell_id = -755;
INSERT IGNORE INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(-755, 'spell_warl_health_funnel');

6
sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql Normal file
View File

@@ -0,0 +1,6 @@
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10304,10313);
INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
(10304,5,62320,0,''),
(10304,12,0,0,''),
(10313,5,62320,0,''),
(10313,12,1,0,'');