From 83627cf2c3a03e6d711b2de29cc8c6706bd9d4cc Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 9 Mar 2018 22:39:02 +0100 Subject: [PATCH] rename files --- .../2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql} | 0 .../2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql} | 0 .../2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql} | 0 .../2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql} | 0 .../2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql} | 0 ...18_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql} | 2 ++ ...18_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql} | 2 ++ ...18_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql} | 2 ++ .../2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql} | 0 src/server/game/Phasing/PhasingHandler.cpp | 3 +++ 10 files changed, 9 insertions(+) rename sql/updates/world/{3.3.5/2018_03_09_00_world.sql => 4.3.4/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_09_01_world.sql => 4.3.4/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_09_02_world.sql => 4.3.4/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_09_04_world.sql => 4.3.4/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_09_05_world.sql => 4.3.4/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_09_06_world_335.sql => 4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_09_07_world_335.sql => 4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_09_08_world_335.sql => 4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_09_09_world.sql => 4.3.4/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/2018_03_09_00_world.sql b/sql/updates/world/4.3.4/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_00_world.sql rename to sql/updates/world/4.3.4/2018_03_09_15_world_from_335_was_2018_03_09_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_09_01_world.sql b/sql/updates/world/4.3.4/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_01_world.sql rename to sql/updates/world/4.3.4/2018_03_09_16_world_from_335_was_2018_03_09_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_09_02_world.sql b/sql/updates/world/4.3.4/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_02_world.sql rename to sql/updates/world/4.3.4/2018_03_09_17_world_from_335_was_2018_03_09_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_09_04_world.sql b/sql/updates/world/4.3.4/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_04_world.sql rename to sql/updates/world/4.3.4/2018_03_09_18_world_from_335_was_2018_03_09_04_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_09_05_world.sql b/sql/updates/world/4.3.4/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_05_world.sql rename to sql/updates/world/4.3.4/2018_03_09_19_world_from_335_was_2018_03_09_05_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_09_06_world_335.sql b/sql/updates/world/4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_09_06_world_335.sql rename to sql/updates/world/4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql index 4325319700c..bbe9b8709ae 100644 --- a/sql/updates/world/3.3.5/2018_03_09_06_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_09_20_world_from_335_was_2018_03_09_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Rhapsody Shindigger DELETE FROM `creature_text` WHERE `CreatureID`=5634; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -32,3 +33,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (563400,9,15,0,0,0,100,0,3000,3500,0,0,5,33,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Play Emote 33"), (563400,9,16,0,0,0,100,0,2000,2000,0,0,17,93,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Set Emote State 93"), (563400,9,17,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Rhapsody Shindigger - On Script - Add Npc Flag Questgiver"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_09_07_world_335.sql b/sql/updates/world/4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_09_07_world_335.sql rename to sql/updates/world/4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql index 965d4313e5b..9ad0071afba 100644 --- a/sql/updates/world/3.3.5/2018_03_09_07_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_09_21_world_from_335_was_2018_03_09_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "The Prodigal Lich Returns" UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=5666; @@ -140,3 +141,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ DELETE FROM `smart_scripts` WHERE `entryorguid`=1931 AND `source_type`=0 AND `id`=1; 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`, `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 (1931,0,1,0,20,0,100,512,407,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Scarlet Zealot - On Quest 'Fields of Grief' Finished - Set Run Off"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_09_08_world_335.sql b/sql/updates/world/4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_09_08_world_335.sql rename to sql/updates/world/4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql index 83c8956fa54..90ddb599efa 100644 --- a/sql/updates/world/3.3.5/2018_03_09_08_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_09_22_world_from_335_was_2018_03_09_08_world_335.sql @@ -1,3 +1,4 @@ +/* -- Junior Apothecary Holland UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=10665; DELETE FROM `smart_scripts` WHERE `entryorguid`=10665 AND `source_type`=0; @@ -19,3 +20,4 @@ UPDATE `waypoint_data` SET `action`=0 WHERE `id`=284120; UPDATE `waypoint_data` SET `delay`=0 WHERE `id`=284120 AND `point` IN (8,12); DELETE FROM `waypoint_scripts` WHERE `id` IN (22,1002,1003,1004,1005); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_09_09_world.sql b/sql/updates/world/4.3.4/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_09_09_world.sql rename to sql/updates/world/4.3.4/2018_03_09_23_world_from_335_was_2018_03_09_09_world.sql diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp index 1190b4b7427..1294f58809d 100644 --- a/src/server/game/Phasing/PhasingHandler.cpp +++ b/src/server/game/Phasing/PhasingHandler.cpp @@ -183,6 +183,9 @@ void PhasingHandler::ResetPhaseShift(WorldObject* object) void PhasingHandler::InheritPhaseShift(WorldObject* target, WorldObject const* source) { + if (!source) + return; + target->GetPhaseShift() = source->GetPhaseShift(); target->GetSuppressedPhaseShift() = source->GetSuppressedPhaseShift(); }