Skip raid minions from boss announcements.

This commit is contained in:
MobiusDevelopment
2022-05-07 19:11:23 +00:00
parent 4c13afcfda
commit 340c981bb6
26 changed files with 104 additions and 104 deletions

View File

@@ -500,7 +500,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Custom boss announcements configuration.
if (this instanceof GrandBoss)
{
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion() && !isRaidMinion())
{
final String name = NpcData.getInstance().getTemplate(getId()).getName();
if (name != null)
@@ -510,7 +510,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
}
}
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion() && !isRaidMinion())
{
final String name = NpcData.getInstance().getTemplate(getId()).getName();
if (name != null)
@@ -2353,7 +2353,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Custom boss announcements configuration.
if (this instanceof GrandBoss)
{
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion() && !isRaidMinion())
{
final String name = NpcData.getInstance().getTemplate(getId()).getName();
if (name != null)
@@ -2363,7 +2363,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
}
}
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion() && !isRaidMinion())
{
final String name = NpcData.getInstance().getTemplate(getId()).getName();
if (name != null)