Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build and SQL import after recent cherry picks

Browse Source
This commit is contained in:
DDuarte
2015-06-26 02:42:24 +01:00
parent aade16a2f4
commit 02df39f791
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql
View File

@@ -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

2
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -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;