Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/OutdoorPvP: Dropped HandleGossipOption and CanTalkTo from OutdoorPvP and move the related stuff to npc scripts

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0de520ed9241e6a6e449a6c9c00194e81b105201)
This commit is contained in:
hondacrx
2022-09-02 14:25:17 -04:00
parent 2cb4ea2ff2
commit dc547288bf
3 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.cs
-7
View File
@@ -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()));
Source/Game/OutdoorPVP/OutdoorPvP.cs
-28
View File
@@ -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;
Source/Game/OutdoorPVP/OutdoorPvPManager.cs
-16
View File
@@ -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();