diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index d2dcc5cd86..683edb5307 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Folk @@ -298,7 +299,7 @@ public class SchemeBuffer extends Folk } // Calculate page number. - final int max = Util.countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/Util.java index 17337db2b1..f567156757 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/Util.java @@ -547,16 +547,6 @@ public class Util } } - /** - * @param objectsSize : The overall elements size. - * @param pageSize : The number of elements per page. - * @return The number of pages, based on the number of elements and the number of elements we want per page. - */ - public static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - /** * This will sort a Map according to the values. Default sort direction is ascending. * @param keyType diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index d2dcc5cd86..683edb5307 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Folk @@ -298,7 +299,7 @@ public class SchemeBuffer extends Folk } // Calculate page number. - final int max = Util.countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java index 17337db2b1..f567156757 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java @@ -547,16 +547,6 @@ public class Util } } - /** - * @param objectsSize : The overall elements size. - * @param pageSize : The number of elements per page. - * @return The number of pages, based on the number of elements and the number of elements we want per page. - */ - public static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - /** * This will sort a Map according to the values. Default sort direction is ascending. * @param keyType diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 34852c2ac8..90d2c0aafc 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 34852c2ac8..90d2c0aafc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 34852c2ac8..90d2c0aafc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java index 36215288a9..ce81259a6e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBuffer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; +import org.l2jmobius.gameserver.util.MathUtil; import org.l2jmobius.gameserver.util.Util; public class SchemeBuffer extends Npc @@ -314,7 +315,7 @@ public class SchemeBuffer extends Npc } // Calculate page number. - final int max = countPagesNumber(skills.size(), PAGE_LIMIT); + final int max = MathUtil.countPagesNumber(skills.size(), PAGE_LIMIT); int page = pageValue; if (page > max) { @@ -435,11 +436,6 @@ public class SchemeBuffer extends Npc return fee; } - private static int countPagesNumber(int objectsSize, int pageSize) - { - return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); - } - private static int getCountOf(List skills, boolean dances) { int count = 0; diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/MathUtil.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/MathUtil.java index a1d8c74e8f..feb8c165ff 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/MathUtil.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/MathUtil.java @@ -91,4 +91,14 @@ public class MathUtil { return (numToTest > max) ? max : ((numToTest < min) ? min : numToTest); } + + /** + * @param objectsSize : The overall elements size. + * @param pageSize : The number of elements per page. + * @return The number of pages, based on the number of elements and the number of elements we want per page. + */ + public static int countPagesNumber(int objectsSize, int pageSize) + { + return (objectsSize / pageSize) + ((objectsSize % pageSize) == 0 ? 0 : 1); + } }