aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql2
-rw-r--r--sql/updates/world/2013_07_18_03_world_equipment.sql4
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp2
3 files changed, 6 insertions, 2 deletions
diff --git a/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql b/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql
index e79a54598e7..c8d7773c461 100644
--- a/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql
+++ b/sql/updates/world/2013_07_18_02_world_the_flesh_giant_slayer.sql
@@ -15,7 +15,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_morbidus' WHERE `entry`=30698;
-- Template updates
UPDATE `creature_template` SET `faction_A`=2102, `faction_H`=2102, `exp`=2, `minlevel`=80, `maxlevel`=80, `unit_flags`=`unit_flags`|832, `speed_run`=0.99206, `VehicleId`=271 WHERE `entry`=30698; -- Morbidus
-UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770, `npcflag`=`npcflag`|1, `equipment_id`=30954, `gossip_menu_id`=10060 WHERE `entry`=31306; -- Margrave Dhakar
+UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770, `npcflag`=`npcflag`|1, `gossip_menu_id`=10060 WHERE `entry`=31306; -- Margrave Dhakar
UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=7.5,`gender`=0 WHERE `modelid`=31176; -- Morbidus
UPDATE `creature_model_info` SET `bounding_radius`=0.3825,`combat_reach`=1.875,`gender`=0 WHERE `modelid`=27558; -- Margrave Dhakar
diff --git a/sql/updates/world/2013_07_18_03_world_equipment.sql b/sql/updates/world/2013_07_18_03_world_equipment.sql
new file mode 100644
index 00000000000..4097327637b
--- /dev/null
+++ b/sql/updates/world/2013_07_18_03_world_equipment.sql
@@ -0,0 +1,4 @@
+-- equipment for Margrave Dhakar
+DELETE FROM `creature_equip_template` WHERE `entry` = 31306;
+INSERT INTO `creature_equip_template` (`entry`, `id`, `itemEntry1`, `itemEntry2`, `itemEntry3`) VALUES
+(31306, 1, 41371, 0, 0);
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index e736710eced..a5d3ed7d0d5 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -1039,7 +1039,7 @@ class npc_margrave_dhakar : public CreatureScript
_lichKingGuid = lichKing->GetGUID();
lichKing = me->SummonCreature(NPC_LICH_KING, morbidus->GetPositionX()+10, morbidus->GetPositionY(), morbidus->GetPositionZ());
lichKing->SetFacingTo(morbidus->GetOrientation());
- lichKing->CastSpell(_lichKing, SPELL_SIMPLE_TELEPORT, true);
+ lichKing->CastSpell(lichKing, SPELL_SIMPLE_TELEPORT, true);
}
_events.ScheduleEvent(EVENT_LK_SAY_1, 5000);