10 files changed, 28 insertions, 44 deletions
diff --git a/sql/updates/world/2012_01_08_06_world_creature_text.sql b/sql/updates/world/2012_01_08_06_world_creature_text.sql
index 3372f05e5ac..31331faaa95 100644
--- a/sql/updates/world/2012_01_08_06_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_06_world_creature_text.sql
@@ -1,11 +1,9 @@
 -- Remove old script text for boss_balinda.cpp "Not sure if the text actually exist"
 DELETE FROM `script_texts` WHERE `entry` IN (-1810023,-1810024);
 -- Add new creature_text for Captain Balinda Stonehearth <Stormpike Captain>
-DELETE FROM `creature_text` WHERE `entry` IN (11949);
+DELETE FROM `creature_text` WHERE `entry`=11949;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
--- Aggro
-(11949,0,0, 'Begone, uncouth scum! The Alliance shall prevail in Alterac Valley!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'),
--- Reset
-(11949,1,0, 'Filthy Frostwolf cowards! If you want a fight, you''ll have to come to me!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'),
+(11949,0,0, 'Begone, uncouth scum! The Alliance shall prevail in Alterac Valley!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'), -- Aggro
+(11949,1,0, 'Filthy Frostwolf cowards! If you want a fight, you''ll have to come to me!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'), -- Reset
 -- (Alliance players receives Stormpike's Salvation buff (+20% health points for 2 minutes))
 (11949,2,0, 'Take heart, Alliance! Throw these villains from Alterac Valley!',14,0,100,0,0,0, 'Captain Balinda Stonehearth');
diff --git a/sql/updates/world/2012_01_08_07_world_creature_text.sql b/sql/updates/world/2012_01_08_07_world_creature_text.sql
index c929866f4f1..0cb9601a156 100644
--- a/sql/updates/world/2012_01_08_07_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_07_world_creature_text.sql
@@ -1,11 +1,8 @@
 -- Remove old script text for boss_galvangar.cpp "Not sure if the text actually exist"
 DELETE FROM `script_texts` WHERE `entry` IN (-1810021,-1810022);
 -- Add new creature_text for Captain Galvangar
-DELETE FROM `creature_text` WHERE `entry` IN (11947);
+DELETE FROM `creature_text` WHERE `entry`=11947;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
--- Aggro
-(11947,0,0, 'Die! Your kind has no place in Alterac Valley!',14,0,100,0,0,0, 'Captain Galvangar'),
--- Reset
-(11947,1,0, 'I''ll never fall for that, fool! If you want a battle it will be on my terms and in my lair!',14,0,100,0,0,0, 'Captain Galvangar'),
--- Casting Fury of the Frostwolf
-(11947,2,0, 'Now is the time to attack! For the Horde!',14,0,100,0,0,0, 'Captain Galvangar');
+(11947,0,0, 'Die! Your kind has no place in Alterac Valley!',14,0,100,0,0,0, 'Captain Galvangar'), -- Aggro
+(11947,1,0, 'I''ll never fall for that, fool! If you want a battle it will be on my terms and in my lair!',14,0,100,0,0,0, 'Captain Galvangar'), -- Reset
+(11947,2,0, 'Now is the time to attack! For the Horde!',14,0,100,0,0,0, 'Captain Galvangar'); -- Casting Fury of the Frostwolf
diff --git a/sql/updates/world/2012_01_08_08_world_creature_text.sql b/sql/updates/world/2012_01_08_08_world_creature_text.sql
index 42249e67b84..7c4a1f9ba7d 100644
--- a/sql/updates/world/2012_01_08_08_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_08_world_creature_text.sql
@@ -1,7 +1,7 @@
 -- Remove old script text for boss_drekthar.cpp "Not sure if the text actually exist"
-DELETE FROM `script_texts` WHERE `entry` IN (-1810000,-1810001,-1810002,-1810003,-1810004,-1810005,-1810006,-1810007);
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1810007 AND -1810000;
 -- Add new creature_text for Drek'Thar
-DELETE FROM `creature_text` WHERE `entry` IN (11946);
+DELETE FROM `creature_text` WHERE `entry`=11946;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
 -- Aggro
 (11946,0,0, 'Stormpike filth! In my keep?! Slay them all!',14,0,100,0,0,0, 'Drek''Thar'),
diff --git a/sql/updates/world/2012_01_08_09_world_creature_text.sql b/sql/updates/world/2012_01_08_09_world_creature_text.sql
index c838e6dc4f2..0cb4f4df29e 100644
--- a/sql/updates/world/2012_01_08_09_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_09_world_creature_text.sql
@@ -1,7 +1,7 @@
 -- Remove old script text for boss_vanndar.cpp "Not sure if the text actually exist"
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -181008 AND -1810018;
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1810018 AND -181008;
 -- Add new creature_text for Vanndar Stormpike
-DELETE FROM `creature_text` WHERE `entry` IN (11948);
+DELETE FROM `creature_text` WHERE `entry`=11948;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
 -- Aggro
 (11948,0,0, 'Soldiers of Stormpike, your General is under attack! I require aid! Come! Come! Slay these mangy Frostwolf dogs.',14,0,100,0,0,0, 'Vanndar Stormpike'),
diff --git a/sql/updates/world/2012_01_08_11_world_creature_text.sql b/sql/updates/world/2012_01_08_11_world_creature_text.sql
index bf34c1f541c..ae4e544b3f7 100644
--- a/sql/updates/world/2012_01_08_11_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_11_world_creature_text.sql
@@ -1,5 +1,5 @@
 -- Remove old script text for eversong_woods.cpp
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000637 AND -1000640;
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000640 AND -1000637;
 -- Master Kelerun Bloodmourn <Blood Knight> say text
 DELETE FROM `creature_text` WHERE `entry`=17807;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
diff --git a/sql/updates/world/2012_01_08_12_world_creature_text.sql b/sql/updates/world/2012_01_08_12_world_creature_text.sql
index a2795b906ef..13b452e7b6a 100644
--- a/sql/updates/world/2012_01_08_12_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_12_world_creature_text.sql
@@ -1,5 +1,5 @@
 -- Twilight Corrupter say text
-DELETE FROM `creature_text` WHERE `entry` IN (15625);
+DELETE FROM `creature_text` WHERE `entry`=15625;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
 (15625,0,0, 'Come, $N. See what the Nightmare brings...',14,0,100,0,0,0, 'Twilight Corrupter'),
 (15625,1,0, 'The Nightmare cannot be stopped!',14,0,100,0,0,0, 'Twilight Corrupter'),
diff --git a/sql/updates/world/2012_01_08_13_world_creature_text.sql b/sql/updates/world/2012_01_08_13_world_creature_text.sql
index 454bd9ae9c3..83e9f70f049 100644
--- a/sql/updates/world/2012_01_08_13_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_13_world_creature_text.sql
@@ -1,5 +1,5 @@
 -- NPC talk text insert from sniff "Orgrimmar Zeppelin Masters"
-DELETE FROM `creature_text` WHERE `entry` IN (12136,26537,9564,34765) AND `groupid` IN (0);
+DELETE FROM `creature_text` WHERE `entry` IN (12136,26537,9564,34765) AND `groupid`=0;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
 (12136,0,0, 'The zeppelin to Grom''gol has just arrived! All aboard for Stranglethorn!',14,0,100,0,0,0, 'Snurk Bucksquick'),
 (26537,0,0, 'The zeppelin to Warsong Hold has just arrived! All aboard for Borean Tundra!',14,0,100,0,0,0, 'Greeb Ramrocket'),
diff --git a/sql/updates/world/2012_01_08_10_world_creature_text.sql b/sql/updates/world/2012_01_08_14_world_creature_text.sql
index b93a0a50d39..d62ac5fdd20 100644
--- a/sql/updates/world/2012_01_08_10_world_creature_text.sql
+++ b/sql/updates/world/2012_01_08_14_world_creature_text.sql
@@ -1,25 +1,15 @@
 -- Remove old script text for arathi_highlands.cpp
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000264 AND -1000273;
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000273 AND -1000264;
 -- Add new creature_text for Professor Phizzlethorpe <Blackwater Raiders>
-DELETE FROM `creature_text` WHERE `entry` IN (2768);
+DELETE FROM `creature_text` WHERE `entry`=2768;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
--- SAY_PROGRESS_1
-(2768,0,0, 'Ok, $N. Follow me to the cave where I''ll attempt to harness the power of the rune stone into these goggles.',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_2
-(2768,1,0, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_3
-(2768,2,0, 'I''ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- EMOTE_PROGRESS_4
-(2768,3,0, '%s begins tinkering with the goggles before the stone.',16,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_AGGRO
-(2768,4,0, 'Help!!! Get these things off me so I can get my work done!',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_5
-(2768,5,0, 'Almost done! Just a little longer!',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_6
-(2768,6,0, 'I''ve done it! I have harnessed the power of the stone into the goggles! Let''s get out of here!',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_7
-(2768,7,0, 'Phew! Glad to be back from that creepy cave.',12,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- EMOTE_PROGRESS_8
-(2768,8,0, '%s hands one glowing goggles over to Doctor Draxlegauge.',16,0,100,0,0,0, 'Professor Phizzlethorpe'),
--- SAY_PROGRESS_9
-(2768,9,0, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!',12,0,100,0,0,0, 'Professor Phizzlethorpe');
+(2768,0,0, 'Ok, $N. Follow me to the cave where I''ll attempt to harness the power of the rune stone into these goggles.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_1'),
+(2768,1,0, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_2'),
+(2768,2,0, 'I''ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_3'),
+(2768,3,0, '%s begins tinkering with the goggles before the stone.',16,0,100,0,0,0, 'Professor Phizzlethorpe - EMOTE_PROGRESS_4'),
+(2768,4,0, 'Help!!! Get these things off me so I can get my work done!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_AGGRO'),
+(2768,5,0, 'Almost done! Just a little longer!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_5'),
+(2768,6,0, 'I''ve done it! I have harnessed the power of the stone into the goggles! Let''s get out of here!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_6'),
+(2768,7,0, 'Phew! Glad to be back from that creepy cave.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_7'),
+(2768,8,0, '%s hands one glowing goggles over to Doctor Draxlegauge.',16,0,100,0,0,0, 'Professor Phizzlethorpe - EMOTE_PROGRESS_8'),
+(2768,9,0, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_9');
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6854a68ac1d..e9a1ac0e64f 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -16657,6 +16657,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
     _LoadInstanceTimeRestrictions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES));
     _LoadBGData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBGDATA));
 
+    GetSession()->SetPlayer(this);
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
     if (!mapEntry || !IsPositionValid())
     {
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index fd649175f76..35276bb1d0a 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -776,6 +776,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     // "GetAccountId() == db stored account id" checked in LoadFromDB (prevent login not own character using cheating tools)
     if (!pCurrChar->LoadFromDB(GUID_LOPART(playerGuid), holder))
     {
+        SetPlayer(NULL);
         KickPlayer();                                       // disconnect client, player no set to session and it will not deleted or saved at kick
         delete pCurrChar;                                   // delete it manually
         delete holder;                                      // delete all unprocessed queries
@@ -784,9 +785,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     }
 
     pCurrChar->GetMotionMaster()->Initialize();
-
-    SetPlayer(pCurrChar);
-
     pCurrChar->SendDungeonDifficulty(false);
 
     WorldPacket data(SMSG_LOGIN_VERIFY_WORLD, 20);