diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index d368db6ea..2e03f5fb3 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -2369,10 +2369,6 @@ namespace Game.Entities case GossipOption.Transmogrifier: case GossipOption.Mailbox: break; // no checks - case GossipOption.Outdoorpvp: - if (!Global.OutdoorPvPMgr.CanTalkTo(this, creature, menuItems)) - canTalk = false; - break; default: Log.outError(LogFilter.Sql, "Creature entry {0} have unknown gossip option {1} for menu {2}", creature.GetEntry(), menuItems.OptionType, menuItems.MenuId); canTalk = false; @@ -2510,9 +2506,6 @@ namespace Game.Entities break; } - case GossipOption.Outdoorpvp: - Global.OutdoorPvPMgr.HandleGossipOption(this, source.ToCreature(), gossipListId); - break; case GossipOption.Spirithealer: if (IsDead()) source.ToCreature().CastSpell(source.ToCreature(), 17251, new CastSpellExtraArgs(TriggerCastFlags.FullMask).SetOriginalCaster(GetGUID())); diff --git a/Source/Game/OutdoorPVP/OutdoorPvP.cs b/Source/Game/OutdoorPVP/OutdoorPvP.cs index fa247e17f..a476588cc 100644 --- a/Source/Game/OutdoorPVP/OutdoorPvP.cs +++ b/Source/Game/OutdoorPVP/OutdoorPvP.cs @@ -140,24 +140,6 @@ namespace Game.PvP return false; } - public virtual bool HandleGossipOption(Player player, Creature creature, uint id) - { - foreach (var pair in m_capturePoints) - if (pair.Value.HandleGossipOption(player, creature, id)) - return true; - - return false; - } - - public virtual bool CanTalkTo(Player player, Creature c, GossipMenuItems gso) - { - foreach (var pair in m_capturePoints) - if (pair.Value.CanTalkTo(player, c, gso)) - return true; - - return false; - } - public virtual bool HandleDropFlag(Player player, uint id) { foreach (var pair in m_capturePoints) @@ -526,16 +508,6 @@ namespace Game.PvP return false; } - public virtual bool HandleGossipOption(Player player, Creature creature, uint id) - { - return false; - } - - public virtual bool CanTalkTo(Player player, Creature c, GossipMenuItems gso) - { - return false; - } - public virtual bool HandleDropFlag(Player player, uint id) { return false; diff --git a/Source/Game/OutdoorPVP/OutdoorPvPManager.cs b/Source/Game/OutdoorPVP/OutdoorPvPManager.cs index cf2adf9f6..4ce23f6ec 100644 --- a/Source/Game/OutdoorPVP/OutdoorPvPManager.cs +++ b/Source/Game/OutdoorPVP/OutdoorPvPManager.cs @@ -166,22 +166,6 @@ namespace Game.PvP return false; } - public void HandleGossipOption(Player player, Creature creature, uint gossipid) - { - OutdoorPvP pvp = player.GetOutdoorPvP(); - if (pvp != null && pvp.HasPlayer(player)) - pvp.HandleGossipOption(player, creature, gossipid); - } - - public bool CanTalkTo(Player player, Creature creature, GossipMenuItems gso) - { - OutdoorPvP pvp = player.GetOutdoorPvP(); - if (pvp != null && pvp.HasPlayer(player)) - return pvp.CanTalkTo(player, creature, gso); - - return false; - } - public void HandleDropFlag(Player player, uint spellId) { OutdoorPvP pvp = player.GetOutdoorPvP();