diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 02:42:24 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 02:42:24 +0100 |
| commit | 02df39f7912900fbabd70ab9a2fb54084ae1911a (patch) | |
| tree | b971f891224e78f3f73e710155d86bb60ac15205 | |
| parent | aade16a2f4871607e4a12464835d230ef239b4b2 (diff) | |
Fix build and SQL import after recent cherry picks
| -rw-r--r-- | sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql | 10 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql b/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql index 9908cf9248e..1df4461fe38 100644 --- a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql +++ b/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql @@ -1,11 +1,11 @@ SET @GUID := 325984; DELETE FROM `creature` WHERE `guid` IN (@GUID, @GUID+1); -INSERT INTO `creature` (`guid`, `id`, `map`, `SpawnMask`, `PhaseId`, `PhaseGroup`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES -(@GUID, 20212, 642, 3, 0, 0, 0, 7.305609, -0.095246, 34.51022, 3.159046, 7200, 0, 0), -(@GUID+1, 20213, 641, 3, 0, 0, 0, 11.69965, 0.034146, 20.62076, 3.211406, 7200, 0, 0); +INSERT INTO `creature` (`guid`, `id`, `map`, `SpawnMask`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES +(@GUID, 20212, 642, 3, 0, 7.305609, -0.095246, 34.51022, 3.159046, 7200, 0, 0), +(@GUID+1, 20213, 641, 3, 0, 11.69965, 0.034146, 20.62076, 3.211406, 7200, 0, 0); DELETE FROM `creature_addon` WHERE `guid` IN (@GUID, @GUID+1); INSERT INTO `creature_addon` (`guid`, `auras`) VALUES -(@GUID, 66656), -- Parachute -(@GUID+1, 66656); -- Parachute +(@GUID, '66656'), -- Parachute +(@GUID+1, '66656'); -- Parachute diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index f33b77e5049..95f2a64b25f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1078,7 +1078,7 @@ class npc_meteor_strike : public CreatureScript _spawnCount += dataCount; } - uint32 GetData(uint32 dataType) override + uint32 GetData(uint32 dataType) const override { if (dataType == DATA_SPAWNED_FLAMES) return _spawnCount; |