From 62e806f67273dffb76b051e731f6c610f53c8623 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 30 Jul 2021 01:01:24 +0000 Subject: [PATCH] Removed level related byte casts. --- L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 8 ++++---- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 4 ++-- .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 8 ++++---- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 4 ++-- .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 8 ++++---- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 4 ++-- .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 6 +++--- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 2 +- .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 6 +++--- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 2 +- .../java/org/l2jmobius/Config.java | 4 ++-- .../gameserver/model/actor/instance/PetInstance.java | 6 +++--- .../gameserver/model/actor/stat/StaticObjectStat.java | 2 +- .../gameserver/network/clientpackets/CharacterCreate.java | 2 +- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java index 2c5b000b21..6a2783cd14 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java @@ -278,7 +278,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1906,7 +1906,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 08aa711359..5cacd0f091 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -231,7 +231,7 @@ public class PetInstance extends Summon pet.setTitle(owner.getName()); if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel())) { - final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel()); + final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel()); pet.getStat().setLevel(availableLevel); pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel)); } @@ -248,7 +248,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel())); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()); } /** @@ -258,13 +258,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 3aee97fa80..b37973f455 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket if (balthusKnights) { newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL)); - newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL); + newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL); if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS) { newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true); @@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java index fff17d3970..c83e324e53 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java @@ -278,7 +278,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1906,7 +1906,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 08aa711359..5cacd0f091 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -231,7 +231,7 @@ public class PetInstance extends Summon pet.setTitle(owner.getName()); if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel())) { - final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel()); + final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel()); pet.getStat().setLevel(availableLevel); pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel)); } @@ -248,7 +248,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel())); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()); } /** @@ -258,13 +258,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 3aee97fa80..b37973f455 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket if (balthusKnights) { newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL)); - newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL); + newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL); if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS) { newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true); @@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/Config.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/Config.java index fff17d3970..c83e324e53 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/Config.java @@ -278,7 +278,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1906,7 +1906,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 08aa711359..5cacd0f091 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -231,7 +231,7 @@ public class PetInstance extends Summon pet.setTitle(owner.getName()); if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel())) { - final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel()); + final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel()); pet.getStat().setLevel(availableLevel); pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel)); } @@ -248,7 +248,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel())); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()); } /** @@ -258,13 +258,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 3aee97fa80..b37973f455 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket if (balthusKnights) { newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL)); - newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL); + newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL); if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS) { newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true); @@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java index b49242a456..2d3ca78659 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -279,7 +279,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1838,7 +1838,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 8a74c01006..4a446cad6a 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -368,7 +368,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1)); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1); } /** @@ -378,13 +378,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 5685d768de..4c3fde6bfb 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -288,7 +288,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java index d23cf7b898..a942561143 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/Config.java @@ -279,7 +279,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1841,7 +1841,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index c009dfc3a0..87dbcaeb69 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -368,7 +368,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1)); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1); } /** @@ -378,13 +378,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index d31d68589b..dbb8ce02a3 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -297,7 +297,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java index 86a6c6cd74..56a02f0838 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java @@ -279,7 +279,7 @@ public class Config public static boolean ALT_COMMAND_CHANNEL_FRIENDS; public static boolean INITIAL_EQUIPMENT_EVENT; public static long STARTING_ADENA; - public static byte STARTING_LEVEL; + public static int STARTING_LEVEL; public static int STARTING_SP; public static long MAX_ADENA; public static boolean AUTO_LOOT; @@ -1841,7 +1841,7 @@ public class Config ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false); INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false); STARTING_ADENA = Character.getLong("StartingAdena", 0); - STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1); + STARTING_LEVEL = Character.getInt("StartingLevel", 1); STARTING_SP = Character.getInt("StartingSP", 0); MAX_ADENA = Character.getLong("MaxAdena", 99900000000L); if (MAX_ADENA < 0) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index c009dfc3a0..87dbcaeb69 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -368,7 +368,7 @@ public class PetInstance extends Summon */ public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control) { - this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1)); + this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1); } /** @@ -378,13 +378,13 @@ public class PetInstance extends Summon * @param control * @param level */ - public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level) + public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level) { super(template, owner); setInstanceType(InstanceType.PetInstance); _controlObjectId = control.getObjectId(); - getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); + getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId()))); _inventory = new PetInventory(this); _inventory.restore(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java index 78259119c3..12ed89e38c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/StaticObjectStat.java @@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat @Override public int getLevel() { - return (byte) getActiveChar().getLevel(); + return getActiveChar().getLevel(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index d31d68589b..dbb8ce02a3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -297,7 +297,7 @@ public class CharacterCreate implements IClientIncomingPacket } if (Config.STARTING_LEVEL > 1) { - newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1)); + newChar.getStat().addLevel(Config.STARTING_LEVEL - 1); } if (Config.STARTING_SP > 0) {