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

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