From de410a1d51edc5df5444ca5cd95e020108867c56 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 16 Nov 2017 22:20:30 +0100 Subject: [PATCH] DB/GameObject: Curious Pirate Landmark --- ...17_11_16_14_world_from_master_was_2017_11_16_03_world.sql | 5 +++++ src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/4.3.4/2017_11_16_14_world_from_master_was_2017_11_16_03_world.sql diff --git a/sql/updates/world/4.3.4/2017_11_16_14_world_from_master_was_2017_11_16_03_world.sql b/sql/updates/world/4.3.4/2017_11_16_14_world_from_master_was_2017_11_16_03_world.sql new file mode 100644 index 0000000000..6ef42fcca8 --- /dev/null +++ b/sql/updates/world/4.3.4/2017_11_16_14_world_from_master_was_2017_11_16_03_world.sql @@ -0,0 +1,5 @@ +-- +SET @OGUID := 200629; +DELETE FROM `gameobject` WHERE `guid`=@OGUID; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`PhaseId`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID,195206,1,1,169,-1161.73, -3605.03, 93.5951, -1.58825,0, 0, -0.71325, 0.70091, 300, 100, 1); diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index 3642269588..3aa14e47c6 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -335,7 +335,7 @@ public: { } - void Reset() + void Reset() override { me->GetMotionMaster()->MoveRandom(7.0f); me->SetReactState(REACT_AGGRESSIVE); @@ -350,7 +350,7 @@ public: me->GetMotionMaster()->Clear(MOTION_SLOT_IDLE); } - void DamageTaken(Unit* attacker, uint32& damage) override + void DamageTaken(Unit* /*attacker*/, uint32& damage) override { if (damage >= me->GetHealth()) damage = me->GetHealth() - 1;