Core/Battlegrounds: Isle of Conquest Rework
Port From (https://github.com/TrinityCore/TrinityCore/commit/409adfa7a5372dedd40d6f40650c901f6fd646a6)
This commit is contained in:
@@ -7,8 +7,9 @@ using Game.BattleGrounds.Zones;
|
|||||||
using Game.BattleGrounds.Zones.AlteracValley;
|
using Game.BattleGrounds.Zones.AlteracValley;
|
||||||
using Game.BattleGrounds.Zones.ArathisBasin;
|
using Game.BattleGrounds.Zones.ArathisBasin;
|
||||||
using Game.BattleGrounds.Zones.EyeofStorm;
|
using Game.BattleGrounds.Zones.EyeofStorm;
|
||||||
using Game.BattleGrounds.Zones.WarsongGluch;
|
using Game.BattleGrounds.Zones.IsleOfConquest;
|
||||||
using Game.BattleGrounds.Zones.StrandOfAncients;
|
using Game.BattleGrounds.Zones.StrandOfAncients;
|
||||||
|
using Game.BattleGrounds.Zones.WarsongGluch;
|
||||||
using Game.DataStorage;
|
using Game.DataStorage;
|
||||||
using Game.Entities;
|
using Game.Entities;
|
||||||
using Game.Networking.Packets;
|
using Game.Networking.Packets;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1217,20 +1217,7 @@ namespace Game.Spells
|
|||||||
if (goInfo.GetNoDamageImmune() != 0 && player.HasUnitFlag(UnitFlags.Immune))
|
if (goInfo.GetNoDamageImmune() != 0 && player.HasUnitFlag(UnitFlags.Immune))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Arathi Basin banner opening. // @todo Verify correctness of this check
|
if (goInfo.type == GameObjectTypes.FlagStand)
|
||||||
if ((goInfo.type == GameObjectTypes.Button && goInfo.Button.noDamageImmune != 0) ||
|
|
||||||
(goInfo.type == GameObjectTypes.Goober && goInfo.Goober.requireLOS != 0))
|
|
||||||
{
|
|
||||||
//CanUseBattlegroundObject() already called in CheckCast()
|
|
||||||
// in Battlegroundcheck
|
|
||||||
Battleground bg = player.GetBattleground();
|
|
||||||
if (bg != null)
|
|
||||||
{
|
|
||||||
bg.EventPlayerClickedOnFlag(player, gameObjTarget);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (goInfo.type == GameObjectTypes.FlagStand)
|
|
||||||
{
|
{
|
||||||
//CanUseBattlegroundObject() already called in CheckCast()
|
//CanUseBattlegroundObject() already called in CheckCast()
|
||||||
// in Battlegroundcheck
|
// in Battlegroundcheck
|
||||||
|
|||||||
Reference in New Issue
Block a user