Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: sql/base/characters_database.sql src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/CharacterHandler.cpp
This commit is contained in:
commit
7c4e7a9ebc
20 files changed
+149
-39
No files matched your search
@@ -1220,7 +1220,7 @@ DROP TABLE IF EXISTS `characters`;
|
||||
CREATE TABLE `characters` (
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
|
||||
`account` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier',
|
||||
`name` varchar(12) NOT NULL DEFAULT '',
|
||||
`name` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
|
||||
`slot` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`race` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`class` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
@@ -2419,4 +2419,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2012-09-05 18:59:26
|
||||
-- Dump completed on 2012-09-08 15:27:29
|
||||
@@ -0,0 +1 @@
|
||||
UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (32930,33909); -- Kologarn
|
||||
@@ -0,0 +1,10 @@
|
||||
-- Criteria data for achievement 'Wrecking Ball'
|
||||
DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (3368, 3369, 3370, 12578, 7623, 3371);
|
||||
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3368, 3369, 3370, 12578, 7623, 3371);
|
||||
INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
|
||||
(3368,2,0,0,''),
|
||||
(3369,2,0,0,''),
|
||||
(3370,2,0,0,''),
|
||||
(12578,2,0,0,''),
|
||||
(7623,2,0,0,''),
|
||||
(3371,2,0,0,'');
|
||||
@@ -0,0 +1,4 @@
|
||||
DELETE FROM `command` WHERE `name` = 'start';
|
||||
DELETE FROM `command` WHERE `name` = 'unstuck';
|
||||
INSERT INTO `command` (`name`, `security`, `help`) VALUES
|
||||
('unstuck', 0, 'Syntax: .unstuck $playername [inn/graveyard/startzone]\n\nTeleports specified player to specified location. Default location is player\'s current hearth location.');
|
||||
@@ -0,0 +1,3 @@
|
||||
DELETE FROM `trinity_string` WHERE `entry`=63; -- Existing entry 63 is not present in Language.h. It's safe to remove it.
|
||||
INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
|
||||
(63, 'You can''t do that right now.');
|
||||
Reference in new issue
Block a user