lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ClassId getId instead of ordinal.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-10-23 09:20:16 +00:00
parent 0ef149a2d8
commit 58259e68d6
81 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -1059,7 +1059,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());
adminReply.replace("%ordinal%", String.valueOf(player.getClassId().ordinal()));
adminReply.replace("%ordinal%", String.valueOf(player.getClassId().getId()));
adminReply.replace("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX()));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java vendored
View File

@@ -92,7 +92,7 @@ public class Q00182_NewRecruits extends Quest
{
htmltext = "32138-00.html";
}
else if ((level >= 17) && (level <= 21) && (player.getClassId().ordinal() == 0))
else if ((level >= 17) && (level <= 21) && (player.getClassId().getId() == 0))
{
htmltext = "32138-01.htm";
}

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@@ -1170,7 +1170,7 @@ public class SkillTreesData implements IXmlReader
}
tempMap.clear();
Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array);
_skillsByClassIdHashCodes.put(cls.getId(), array);
}
// Race specific skills from Fishing and Transformation skill trees.
@@ -1272,7 +1272,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final int hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl));
if (Arrays.binarySearch(_skillsByClassIdHashCodes.get(player.getClassId().ordinal()), hashCode) >= 0)
if (Arrays.binarySearch(_skillsByClassIdHashCodes.get(player.getClassId().getId()), hashCode) >= 0)
{
return true;
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -63,7 +63,7 @@ public class SubClass
public int getClassId()
{
return _class.ordinal();
return _class.getId();
}
public long getExp()

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
View File

@@ -265,7 +265,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class)
{
if (((PlayerInstance) creature).getClassId().ordinal() == _clas)
if (((PlayerInstance) creature).getClassId().getId() == _clas)
{
ok = true;
break;

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@@ -83,9 +83,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
player.sendPacket(ActionFailed.STATIC_PACKET);
if ((player.getRace() != Race.DWARF) && (player.getClassId().ordinal() != 117) && (player.getClassId().ordinal() != 55))
if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55))
{
LOGGER.info("Player " + client + " used crystalize with classid: " + player.getClassId().ordinal());
LOGGER.info("Player " + client + " used crystalize with classid: " + player.getClassId().getId());
}
return;
}