Fixed Sel Mahum training groups.
This commit is contained in:
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -75,7 +75,7 @@ public final class SelMahumDrill extends AbstractNpcAI
|
|||||||
NpcStringId.LINE_UP_THE_RANKS
|
NpcStringId.LINE_UP_THE_RANKS
|
||||||
};
|
};
|
||||||
// Chiefs event broadcast range
|
// Chiefs event broadcast range
|
||||||
private static final int TRAINING_RANGE = 1000;
|
private static final int TRAINING_RANGE = 1500;
|
||||||
|
|
||||||
private enum Actions
|
private enum Actions
|
||||||
{
|
{
|
||||||
|
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -1468,7 +1468,7 @@ public class Npc extends Creature
|
|||||||
*/
|
*/
|
||||||
public boolean isInMySpawnGroup(Npc npc)
|
public boolean isInMySpawnGroup(Npc npc)
|
||||||
{
|
{
|
||||||
return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
|
return getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName().equals(npc.getSpawn().getNpcSpawnTemplate().getSpawnTemplate().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user