Proper fix for previous commit.
This commit is contained in:
parent
598c5408f5
commit
a3737ec171
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -429,23 +429,6 @@ public class Spawn extends Location implements IIdentifiable, INamable
|
||||
npc.setHeading(getHeading());
|
||||
}
|
||||
|
||||
if (npc.isAttackable())
|
||||
{
|
||||
((Attackable) npc).setChampion(false);
|
||||
}
|
||||
|
||||
if (Config.CHAMPION_ENABLE)
|
||||
{
|
||||
// Set champion on next spawn
|
||||
if (npc.isMonster() && !npc.isQuestMonster() && !_template.isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0)))
|
||||
{
|
||||
if (Rnd.get(100) < Config.CHAMPION_FREQUENCY)
|
||||
{
|
||||
((Attackable) npc).setChampion(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reset summoner
|
||||
npc.setSummoner(null);
|
||||
// Reset summoned list
|
||||
@ -475,6 +458,23 @@ public class Spawn extends Location implements IIdentifiable, INamable
|
||||
((MonsterInstance) npc).getMinionList().spawnMinions(npc.getTemplate().getParameters().getMinionList("Privates"));
|
||||
}
|
||||
|
||||
if (npc.isAttackable())
|
||||
{
|
||||
((Attackable) npc).setChampion(false);
|
||||
}
|
||||
|
||||
if (Config.CHAMPION_ENABLE)
|
||||
{
|
||||
// Set champion on next spawn
|
||||
if (npc.isMonster() && !npc.isQuestMonster() && !_template.isUndying() && !npc.isRaid() && !npc.isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (npc.getLevel() >= Config.CHAMP_MIN_LVL) && (npc.getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0)))
|
||||
{
|
||||
if (Rnd.get(100) < Config.CHAMPION_FREQUENCY)
|
||||
{
|
||||
((Attackable) npc).setChampion(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return npc;
|
||||
}
|
||||
|
||||
|
@ -142,7 +142,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
@ -140,7 +140,6 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
|
||||
public void onSpawn()
|
||||
{
|
||||
broadcastInfo(); // Tempfix for invisible spawns.
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -45,7 +45,6 @@ public class DecayTaskManager
|
||||
final Creature creature = entry.getKey();
|
||||
DECAY_SCHEDULES.remove(creature);
|
||||
creature.onDecay();
|
||||
creature.setXYZ(0, 0, -10000);
|
||||
}
|
||||
}
|
||||
}, 0, 1000);
|
||||
|
Loading…
Reference in New Issue
Block a user