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

Better getter and setter naming for player sex.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-08-23 08:15:23 +00:00
parent d59f75b7fa
commit 895f3b56c7
196 changed files with 593 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
}
// Ertheias can only be female
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
{
player.getAppearance().setSex(true);
player.getAppearance().setFemale();
}
// Change class
player.setClassId(newClass.getId());

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java vendored
View File

@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
if (player.getRace() == Race.KAMAEL)
{
if (player.getAppearance().getSex())
if (player.getAppearance().isFemale())
{
subclasses.remove(PlayerClass.femaleSoulbreaker);
}

19
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
if (player.getAppearance().getSex())
if (player.getAppearance().isFemale())
{
player.getAppearance().setSex(false);
player.getAppearance().setMale();
}
break;
}
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
if (!player.getAppearance().getSex())
if (!player.getAppearance().isFemale())
{
player.getAppearance().setSex(true);
player.getAppearance().setFemale();
}
break;
}
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
if (player.getRace() == Race.ERTHEIA)
{
player.getAppearance().setSex(true);
player.getAppearance().setFemale();
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
{
return false;
}
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
if (player.getAppearance().isFemale())
{
player.getAppearance().setMale();
}
else
{
player.getAppearance().setFemale();
}
player.sendMessage("Your gender has been changed by a GM");
player.broadcastUserInfo();
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java vendored
View File

@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
}
}