rename files

sql/updates/world/4.3.4/2018_06_23_08_world_from_335_was_2018_06_23_00_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- Private Thorsen
 DELETE FROM `creature_text` WHERE `CreatureID` IN (738,775,733);
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -93,3 +94,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 (775,0,2,0,38,0,100,0,1,1,0,0,0,2,46,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kurzen's Agent - On Data Set - Set Faction 46"),
 (775,0,3,0,38,0,100,0,1,1,0,0,0,49,0,0,0,0,0,0,19,738,0,0,0,0,0,0,"Kurzen's Agent - On Data Set - Start Attacking"),
 (775,0,4,0,6,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,19,738,0,0,0,0,0,0,"Kurzen's Agent - On Just Died - Set Data to Private Thorsen");
+*/

sql/updates/world/4.3.4/2018_06_23_09_world_from_335_was_2018_06_23_01_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- Forlorn Spirit
 DELETE FROM `smart_scripts` WHERE `entryorguid`=2044 AND `source_type`=0 AND `id`=0;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=204400 AND `source_type`=9;
@@ -13,3 +14,4 @@ UPDATE `smart_scripts` SET `target_x`=-8841.93, `target_y`=985.171, `target_z`=9
 
 -- Marshal Haggard's Chest
 UPDATE `event_scripts` SET `delay`=0, `x`=-9553.53, `y`=-1432.44, `z`=62.2943, `o`=5.28835 WHERE `id`=264;
+*/

sql/updates/world/4.3.4/2018_06_23_11_world_from_335_was_2018_06_23_03_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- Bookie Herod
 SET @GUID := 73429;
 DELETE FROM `creature` WHERE `guid`=@GUID;
@@ -15,3 +16,4 @@ UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=2638;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=2638 AND `source_type`=0;
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
 (2638,0,0,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0,"Syndicate Spectre - Just Summoned - Start Attacking");
+*/

sql/updates/world/4.3.4/2018_06_23_12_world_from_335_was_2018_06_23_04_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- Pygmy Venom Web Spider
 DELETE FROM `smart_scripts` WHERE `entryorguid`=539 AND `source_type`=0;
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
@@ -197,3 +198,4 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=1200 AND `source_type`=0 AND `id
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
 (1200,0,2,0,0,0,100,0,0,0,3000,5000,0,11,3108,64,0,0,0,0,2,0,0,0,0,0,0,0,"Morbent Fel - In Combat - Cast 'Touch of Death'"),
 (1200,0,3,0,0,0,100,0,3000,6000,18000,24000,0,11,3109,0,0,0,0,0,1,0,0,0,0,0,0,0,"Morbent Fel - In Combat - Cast 'Presence of Death'");
+*/

sql/updates/world/4.3.4/2018_06_23_13_world_from_335_was_2018_06_23_05_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- Quest "Look To The Stars"
 DELETE FROM `quest_details` WHERE `ID`=174;
 INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
@@ -357,3 +358,4 @@ INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `Emot
 (240,4,0,0,0,0,0,0,0,0);
 UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=240;
 UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=240;
+*/

sql/updates/world/4.3.4/2018_06_23_15_world_from_335_was_2018_06_23_07_world_335.sql

@@ -1,3 +1,4 @@
+/*
 -- https://www.youtube.com/watch?v=cWnT_Qndfx0
 DELETE FROM `quest_greeting_locale` WHERE `ID` IN (237,238) AND `locale`='deDE';
 INSERT INTO `quest_greeting_locale` (`ID`, `Type`, `locale`, `Greeting`, `VerifiedBuild`) VALUES (237, 0, 'deDE', 'In dieser Gegend gibt es wirklich nichts als Ärger. Ich habe versucht, den Dummkopf Saldean dazu zu bringen, sich aus dem Staub zu machen, solange das noch geht, aber er will einfach nicht hören. Aber ich bin kein Dummkopf. Verna und ich hauen ab, sobald wir diesen Wagen repariert haben.', 0);
@@ -44,3 +45,4 @@ UPDATE `quest_template_locale` SET `OfferRewardText`='Als ich Lordaeron, dieses
 
 -- https://www.youtube.com/watch?v=8-sXhLcEFXo
 UPDATE `quest_template_locale` SET `RequestItemsText`='Ist das Schweiß auf Eurer Stirn, $Gder Herr:gnädige Frau;? Ihr habt Euch beim Laufen zu sehr verausgabt. Nehmt nächstes Mal einen Greifen!', `OfferRewardText`='Eine Kiste für Westfall, eh? Seid Ihr schon mal in Westfall gewesen? Falls ja, ist das kein Problem. Ich habe viele Greifen ausgebildet, damit sie diese Route fliegen können!' WHERE `ID`=6261 AND `locale`='deDE';
+*/

src/server/scripts/Commands/cs_battlenet_account.cpp

@@ -129,10 +129,10 @@ public:
         {
             if (param == "on")
             {
-                if (IpLocationRecord* location = sIPLocation->GetData(handler->GetSession()->GetRemoteAddress()))
+                if (IpLocationRecord const* location = sIPLocation->GetLocationRecord(handler->GetSession()->GetRemoteAddress()))
                 {
                     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_ACCOUNT_LOCK_COUNTRY);
-                    stmt->setString(0, location->country_code);
+                    stmt->setString(0, location->CountryCode);
                     stmt->setUInt32(1, handler->GetSession()->GetBattlenetAccountId());
                     LoginDatabase.Execute(stmt);
                     handler->PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED);