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

4 files changed, 18 insertions, 0 deletions

diff --git a/sql/updates/world/2012_09_08_01_world_creature_template.sql b/sql/updates/world/2012_09_08_01_world_creature_template.sql
new file mode 100644
index 00000000000..fb34f345f2d
--- /dev/null
+++ b/sql/updates/world/2012_09_08_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (32930,33909); -- Kologarn
diff --git a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql b/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..2f25f6f20fa
--- /dev/null
+++ b/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
@@ -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,'');
diff --git a/sql/updates/world/2012_09_09_00_world_command.sql b/sql/updates/world/2012_09_09_00_world_command.sql
new file mode 100644
index 00000000000..1fb3247bfbb
--- /dev/null
+++ b/sql/updates/world/2012_09_09_00_world_command.sql
@@ -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.');
diff --git a/sql/updates/world/2012_09_09_01_world_trinity_string.sql b/sql/updates/world/2012_09_09_01_world_trinity_string.sql
new file mode 100644
index 00000000000..2f3c0aa1938
--- /dev/null
+++ b/sql/updates/world/2012_09_09_01_world_trinity_string.sql
@@ -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.');