Exclude minions from boss announcements.
This commit is contained in:
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -316,7 +316,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// Custom boss announcements configuration.
|
||||
if (this instanceof GrandBoss)
|
||||
{
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -326,7 +326,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -1839,7 +1839,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// Custom boss announcements configuration.
|
||||
if (this instanceof GrandBoss)
|
||||
{
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -1849,7 +1849,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -318,7 +318,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// Custom boss announcements configuration.
|
||||
if (this instanceof GrandBoss)
|
||||
{
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -328,7 +328,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -1882,7 +1882,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
// Custom boss announcements configuration.
|
||||
if (this instanceof GrandBoss)
|
||||
{
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
@@ -1892,7 +1892,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcTable.getInstance().getTemplate(((Npc) this).getNpcId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -530,7 +530,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -540,7 +540,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -2506,7 +2506,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -2516,7 +2516,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
@@ -531,7 +531,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -541,7 +541,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -2508,7 +2508,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -2518,7 +2518,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && ((getInstanceId() == 0) || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1764,7 +1764,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1764,7 +1764,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1764,7 +1764,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -598,7 +598,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -608,7 +608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1763,7 +1763,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1773,7 +1773,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1767,7 +1767,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1777,7 +1777,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1784,7 +1784,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1784,7 +1784,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
+4
-4
@@ -599,7 +599,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))
|
||||
if (Config.GRANDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -609,7 +609,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_SPAWN_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1774,7 +1774,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))
|
||||
if (Config.GRANDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.GRANDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
@@ -1784,7 +1784,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS))
|
||||
else if (isRaid() && Config.RAIDBOSS_DEFEAT_ANNOUNCEMENTS && (!isInInstance() || Config.RAIDBOSS_INSTANCE_ANNOUNCEMENTS) && !isMinion())
|
||||
{
|
||||
final String name = NpcData.getInstance().getTemplate(getId()).getName();
|
||||
if (name != null)
|
||||
|
||||
Reference in New Issue
Block a user