From 7abf85efd62c7461be6cecd54f83a7f79af10804 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 18 Aug 2022 21:13:38 +0000 Subject: [PATCH] Fixed inconsistency between max pet level and summon exp. --- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- .../game/data/scripts/handlers/effecthandlers/Summon.java | 8 ++++---- 28 files changed, 112 insertions(+), 112 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java index ad618c4e68..051bdc1f3f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java index db90cfd41c..3524502e51 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -82,14 +82,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java index db90cfd41c..3524502e51 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -82,14 +82,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java index a59087cf7f..bc7dfe98e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -82,14 +82,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(Summon.class.getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxPetLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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()); diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Summon.java index 01f538ed66..56ae5410bf 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -94,14 +94,14 @@ public class Summon extends AbstractEffect summon.setItemConsume(_consumeItem); 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)); - LOGGER.warning(getClass().getSimpleName() + ": (" + summon.getName() + ") NpcID: " + summon.getId() + " has a level above " + ExperienceData.getInstance().getMaxLevel() + ". Please rectify."); + summon.getStat().setExp(ExperienceData.getInstance().getExpForLevel(maxPetLevel - 1)); } 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.