Fixed inconsistency between max pet level and summon exp.
This commit is contained in:
parent
a443514a7c
commit
7abf85efd6
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -82,14 +82,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxPetLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxPetLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
summon.setCurrentHp(summon.getMaxHp());
|
summon.setCurrentHp(summon.getMaxHp());
|
||||||
|
@ -82,14 +82,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxPetLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxPetLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
summon.setCurrentHp(summon.getMaxHp());
|
summon.setCurrentHp(summon.getMaxHp());
|
||||||
|
@ -82,14 +82,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxPetLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxPetLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
summon.setCurrentHp(summon.getMaxHp());
|
summon.setCurrentHp(summon.getMaxHp());
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
@ -94,14 +94,14 @@ public class Summon extends AbstractEffect
|
|||||||
summon.setItemConsume(_consumeItem);
|
summon.setItemConsume(_consumeItem);
|
||||||
summon.setItemConsumeInterval(consumeItemInterval);
|
summon.setItemConsumeInterval(consumeItemInterval);
|
||||||
|
|
||||||
if (summon.getLevel() >= ExperienceData.getInstance().getMaxLevel())
|
final int maxPetLevel = ExperienceData.getInstance().getMaxPetLevel();
|
||||||
|
if (summon.getLevel() >= maxPetLevel)
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(ExperienceData.getInstance().getMaxLevel() - 1));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1));
|
||||||
LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % ExperienceData.getInstance().getMaxPetLevel()));
|
summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(summon.getLevel() % maxPetLevel));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Summons must have their master buffs upon spawn.
|
// Summons must have their master buffs upon spawn.
|
||||||
|
Loading…
Reference in New Issue
Block a user