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
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1147,7 +1147,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1569,7 +1569,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1681,7 +1681,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1571,7 +1571,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1683,7 +1683,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1166,7 +1166,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1571,7 +1571,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1683,7 +1683,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1059,7 +1059,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
Vendored
+1 -1
View File
@@ -92,7 +92,7 @@ public class Q00182_NewRecruits extends Quest
{ {
htmltext = "32138-00.html"; 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"; htmltext = "32138-01.htm";
} }
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1170,7 +1170,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // 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 maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final int hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); 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; return true;
} }
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -265,7 +265,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
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(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
player.sendPacket(ActionFailed.STATIC_PACKET); 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; return;
} }
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1131,7 +1131,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
Vendored
+1 -1
View File
@@ -1143,7 +1143,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%xp%", String.valueOf(player.getExp())); adminReply.replace("%xp%", String.valueOf(player.getExp()));
adminReply.replace("%sp%", String.valueOf(player.getSp())); adminReply.replace("%sp%", String.valueOf(player.getSp()));
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode()); 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("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode()); adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX())); adminReply.replace("%x%", String.valueOf(player.getX()));
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+2 -2
View File
@@ -1557,7 +1557,7 @@ public class SkillTreesData implements IXmlReader
} }
tempMap.clear(); tempMap.clear();
Arrays.sort(array); Arrays.sort(array);
_skillsByClassIdHashCodes.put(cls.ordinal(), array); _skillsByClassIdHashCodes.put(cls.getId(), array);
} }
// Race specific skills from Fishing and Transformation skill trees. // Race specific skills from Fishing and Transformation skill trees.
@@ -1669,7 +1669,7 @@ public class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final long hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl)); final long 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; return true;
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SubClass
public int getClassId() public int getClassId()
{ {
return _class.ordinal(); return _class.getId();
} }
public long getExp() public long getExp()
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneType.java
+1 -1
View File
@@ -276,7 +276,7 @@ public abstract class ZoneType extends ListenersContainer
for (int _clas : _class) for (int _clas : _class)
{ {
if (((PlayerInstance) creature).getClassId().ordinal() == _clas) if (((PlayerInstance) creature).getClassId().getId() == _clas)
{ {
ok = true; ok = true;
break; break;
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+2 -2
View File
@@ -87,9 +87,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
{ {
client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW); client.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
client.sendPacket(ActionFailed.STATIC_PACKET); client.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 " + player + " used crystalize with classid: " + player.getClassId().ordinal()); LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId());
} }
return; return;
} }