aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2011_11_11_01_world_misc.sql14
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp19
2 files changed, 33 insertions, 0 deletions
diff --git a/sql/updates/world/2011_11_11_01_world_misc.sql b/sql/updates/world/2011_11_11_01_world_misc.sql
new file mode 100644
index 00000000000..a1013a75f1a
--- /dev/null
+++ b/sql/updates/world/2011_11_11_01_world_misc.sql
@@ -0,0 +1,14 @@
+-- Template updates for creature 30560 (The RP-GG)
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16777216 WHERE `entry`=30560; -- The RP-GG
+-- Addon data for creature 30560 (The RP-GG)
+DELETE FROM `creature_template_addon` WHERE `entry`=30560;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(30560,0,0,1,0, NULL); -- The RP-GG
+
+-- Fixing spawntime for creature 30560 (The RP-GG)
+UPDATE `creature` SET `spawntimesecs`=60 WHERE `id`=30560;
+
+-- Spellclick data for creature 30560 (The RP-GG)
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=30560;
+INSERT INTO `npc_spellclick_spells` VALUES
+(30560,57347,0,0,0,1,0,0,1);
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 26ef498b6ff..3767b6ba560 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -4953,6 +4953,25 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
}
return;
}
+ case 57347: // Retrieving (Wintergrasp RP-GG pickup spell)
+ {
+ if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->GetTypeId() != TYPEID_PLAYER)
+ return;
+
+ unitTarget->ToCreature()->DespawnOrUnsummon();
+
+ return;
+ }
+ case 57349: // Drop RP-GG (Wintergrasp RP-GG at death drop spell)
+ {
+ if (m_caster->GetTypeId() != TYPEID_PLAYER)
+ return;
+
+ // Delete item from inventory at death
+ m_caster->ToPlayer()->DestroyItemCount(damage, 5, true);
+
+ return;
+ }
case 58418: // Portal to Orgrimmar
case 58420: // Portal to Stormwind
{