diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 79636b45f1..eb45feac27 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b50a1f5888..a67b5c35c3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6496,7 +6496,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7155,7 +7155,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12640,7 +12640,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12652,7 +12652,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 9a44ad043d..2a12915e19 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 6f2409b47a..de83f488ca 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 65fcb3ce55..925175bf30 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 125ff26dd8..e3f5734e86 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 7a7531d7bd..e9653f6545 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bb145e7534..528a77a047 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6502,7 +6502,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7162,7 +7162,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12647,7 +12647,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12659,7 +12659,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 804357f09d..2dc2c749ca 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 3b1bd2085b..0de1514c8d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index eda5a337e1..4900f55200 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c80dc23f89..6440911856 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 7a7531d7bd..e9653f6545 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f08e004775..387f1a040d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6504,7 +6504,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7164,7 +7164,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12649,7 +12649,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12661,7 +12661,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 804357f09d..2dc2c749ca 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 3b1bd2085b..0de1514c8d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index eda5a337e1..4900f55200 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c80dc23f89..6440911856 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 7a7531d7bd..e9653f6545 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2c3903a204..1bc7049455 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6498,7 +6498,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7158,7 +7158,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12628,7 +12628,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12640,7 +12640,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 804357f09d..2dc2c749ca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 1bb4dba263..812f41c3ef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 0e992a0671..a94292cf79 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 52294effde..ce10bcce89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c7d7c75d26..907df9f4f8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f9fa73eb8f..c874c7f895 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6480,7 +6480,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7140,7 +7140,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12618,7 +12618,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12630,7 +12630,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index d5f764b94a..be6ad1e997 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 1bb4dba263..812f41c3ef 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 0e992a0671..a94292cf79 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 2b79ab35b9..49f8b34084 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c7d7c75d26..907df9f4f8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 4949972b58..173ecca975 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6480,7 +6480,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7140,7 +7140,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12621,7 +12621,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12633,7 +12633,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index d5f764b94a..be6ad1e997 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 8c94d6271a..63d2790886 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 0e992a0671..a94292cf79 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 5167a399f8..256534ea6b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index df7767731a..796746f264 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -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()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java index c53cec6f22..7785084e4f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java @@ -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); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index c7d7c75d26..907df9f4f8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -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(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 63097b4299..f1392081f8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6481,7 +6481,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7141,7 +7141,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12627,7 +12627,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12639,7 +12639,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index d5f764b94a..be6ad1e997 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 8c94d6271a..63d2790886 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 0e992a0671..a94292cf79 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 5167a399f8..256534ea6b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java index b97f828f56..114f1e581b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java @@ -587,7 +587,14 @@ public class AdminEditChar implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "Select player before command"); return false; } - player.getAppearance().setSex(player.getAppearance().getSex() ? false : true); + if (player.getAppearance().isFemale()) + { + player.getAppearance().setMale(); + } + else + { + player.getAppearance().setFemale(); + } PlayerInstance.setSexDB(player, 1); player.sendMessage("Your gender has been changed by a GM"); player.decayMe(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index a00333beb0..f390436a08 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -208,7 +208,7 @@ public class Wedding implements IVoicedCommandHandler return false; } - if ((ptarget.getAppearance().getSex() == activeChar.getAppearance().getSex()) && !Config.L2JMOD_WEDDING_SAMESEX) + if ((ptarget.getAppearance().isFemale() == activeChar.getAppearance().isFemale()) && !Config.L2JMOD_WEDDING_SAMESEX) { activeChar.sendMessage("Gay marriage is not allowed on this server!"); return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index b778a35bb9..376f0f76ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -66,14 +66,19 @@ public class PlayerAppearance _hairStyle = (byte) value; } - public boolean getSex() + public boolean isFemale() { return _sex; } - public void setSex(boolean isfemale) + public void setFemale() { - _sex = isfemale; + _sex = true; + } + + public void setMale() + { + _sex = false; } public void setInvisible() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 825022cde3..4bb3095903 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -8906,7 +8906,7 @@ public class PlayerInstance extends Playable statement.setInt(28, getAppearance().getFace()); statement.setInt(29, getAppearance().getHairStyle()); statement.setInt(30, getAppearance().getHairColor()); - statement.setInt(31, getAppearance().getSex() ? 1 : 0); + statement.setInt(31, getAppearance().isFemale() ? 1 : 0); statement.setDouble(32, 1/* getMovementMultiplier() */); statement.setDouble(33, 1/* getAttackSpeedMultiplier() */); statement.setDouble(34, getTemplate().collisionRadius/* getCollisionRadius() */); @@ -17795,7 +17795,7 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection()) { final PreparedStatement statement = con.prepareStatement("UPDATE characters SET sex=? WHERE obj_Id=?"); - statement.setInt(1, player.getAppearance().getSex() ? 1 : 0); + statement.setInt(1, player.getAppearance().isFemale() ? 1 : 0); statement.setInt(2, player.getObjectId()); statement.execute(); statement.close(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java index 0bdbd92b3b..3de6ed44f8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java @@ -138,13 +138,13 @@ public class WeddingManagerInstance extends NpcInstance player.setMarryAccepted(true); int type; - if (player.getAppearance().getSex() && ptarget.getAppearance().getSex()) + if (player.getAppearance().isFemale() && ptarget.getAppearance().isFemale()) { player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO); ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO); type = 1; } - else if (!player.getAppearance().getSex() && !ptarget.getAppearance().getSex()) + else if (!player.getAppearance().isFemale() && !ptarget.getAppearance().isFemale()) { player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY); ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index b2c5cb985a..f959e27304 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -217,7 +217,7 @@ public class CharInfo extends GameServerPacket writeD(_player.getObjectId()); writeS(_player.getName()); writeD(_player.getRace().ordinal()); - writeD(_player.getAppearance().getSex() ? 1 : 0); + writeD(_player.getAppearance().isFemale() ? 1 : 0); if (_player.getClassIndex() == 0) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 12c57cc09e..a247b32b02 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -48,7 +48,7 @@ public class CharSelected extends GameServerPacket writeD(_sessionId); writeD(_player.getClanId()); writeD(0x00); // ?? - writeD(_player.getAppearance().getSex() ? 1 : 0); + writeD(_player.getAppearance().isFemale() ? 1 : 0); writeD(_player.getRace().ordinal()); writeD(_player.getClassId().getId()); writeD(0x01); // active ?? diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index b43463e3c4..ea2b3980fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo extends GameServerPacket writeD(_player.getObjectId()); writeS(_player.getName()); writeD(_player.getRace().ordinal()); - writeD(_player.getAppearance().getSex() ? 1 : 0); + writeD(_player.getAppearance().isFemale() ? 1 : 0); writeD(_player.getClassId().getId()); writeD(_player.getLevel()); writeQ(_player.getExp()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 2acd4f6789..383885a070 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -105,7 +105,7 @@ public class UserInfo extends GameServerPacket writeD(_player.getObjectId()); writeS(_player.getName()); writeD(_player.getRace().ordinal()); - writeD(_player.getAppearance().getSex() ? 1 : 0); + writeD(_player.getAppearance().isFemale() ? 1 : 0); if (_player.getClassIndex() == 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index fd111a9d88..11a6ceff9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -395,10 +395,10 @@ public class AdminEditChar implements IAdminCommandHandler case 131: // Doombringer case 132: // Soul Hound (Male) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { sexChange = true; - player.getAppearance().setSex(false); + player.getAppearance().setMale(); } break; } @@ -409,10 +409,10 @@ public class AdminEditChar implements IAdminCommandHandler case 133: // Soul Hound (Female) case 134: // Trickster { - if (!player.getAppearance().getSex()) + if (!player.getAppearance().isFemale()) { sexChange = true; - player.getAppearance().setSex(true); + player.getAppearance().setFemale(); } break; } @@ -532,7 +532,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(); // Transform-untransorm player quickly to force the client to reload the character textures diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java index b8d0ee94b3..cc4fc174f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java @@ -202,7 +202,7 @@ public class Wedding implements IVoicedCommandHandler return false; } - if ((ptarget.getAppearance().getSex() == activeChar.getAppearance().getSex()) && !Config.WEDDING_SAMESEX) + if ((ptarget.getAppearance().isFemale() == activeChar.getAppearance().isFemale()) && !Config.WEDDING_SAMESEX) { activeChar.sendMessage("Gay marriage is not allowed on this server!"); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 8ed4914210..88a6322bc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -126,17 +126,19 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) + public void setFemale() { - _sex = isfemale; + _sex = true; + } + + public void setMale() + { + _sex = false; } public int getNameColor() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0df9bedfb8..453013add4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6730,7 +6730,7 @@ public class PlayerInstance extends Playable ps.setInt(11, _appearance.getFace()); ps.setInt(12, _appearance.getHairStyle()); ps.setInt(13, _appearance.getHairColor()); - ps.setInt(14, _appearance.getSex() ? 1 : 0); + ps.setInt(14, _appearance.isFemale() ? 1 : 0); ps.setLong(15, getExp()); ps.setLong(16, getSp()); ps.setInt(17, getKarma()); @@ -7349,7 +7349,7 @@ public class PlayerInstance extends Playable ps.setInt(8, _appearance.getFace()); ps.setInt(9, _appearance.getHairStyle()); ps.setInt(10, _appearance.getHairColor()); - ps.setInt(11, _appearance.getSex() ? 1 : 0); + ps.setInt(11, _appearance.isFemale() ? 1 : 0); ps.setInt(12, getHeading()); ps.setInt(13, _observerMode ? _lastLoc.getX() : getX()); ps.setInt(14, _observerMode ? _lastLoc.getY() : getY()); @@ -13556,7 +13556,7 @@ public class PlayerInstance extends Playable { return _transformation.getCollisionRadius(this); } - return _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); } public double getCollisionHeight() @@ -13569,7 +13569,7 @@ public class PlayerInstance extends Playable { return _transformation.getCollisionHeight(this); } - return _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); } public int getClientX() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 320eba47d5..d5dd027261 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -112,7 +112,7 @@ public class Transform implements IIdentifiable public TransformTemplate getTemplate(PlayerInstance player) { - return player != null ? (player.getAppearance().getSex() ? _femaleTemplate : _maleTemplate) : null; + return player != null ? (player.getAppearance().isFemale() ? _femaleTemplate : _maleTemplate) : null; } public void setTemplate(boolean male, TransformTemplate template) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 451e1da40c..ada3a3e218 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -284,7 +284,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 0884aebd81..e4cd2708f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -96,7 +96,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -118,7 +118,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -316,7 +316,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index 6ab0790a60..27279423b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -40,6 +40,6 @@ public class ConditionPlayerSex extends Condition @Override public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item) { - return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex); + return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 34ea370ec8..80a25dde89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -124,7 +124,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_objId); packet.writeS(_player.getAppearance().getVisibleName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseClass()); for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 96ab1a1eb5..0e3226dfc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 055891f524..cc0d5c0fd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -56,7 +56,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 089bd41082..e57610fa7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal());// packet.writeD(1); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index b3d8c55ae8..1b3bfb19ed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -52,7 +52,7 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket _level = player.getLevel(); _classId = player.getClassId().getId(); _race = player.getRace().ordinal(); - _sex = player.getAppearance().getSex() ? 1 : 0; + _sex = player.getAppearance().isFemale() ? 1 : 0; _objectId = player.getObjectId(); _isOnline = player.isOnline(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index ab24ffc8cb..dfc10fba6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -94,7 +94,7 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getAppearance().getVisibleName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseClass()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 36d08c7643..16547afe27 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ab273ba6ea..acb388df8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6467,7 +6467,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7126,7 +7126,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12482,7 +12482,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12494,7 +12494,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index f76959b595..be68c2d4b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 740951c9d2..b92e24126b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -145,7 +145,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 36d08c7643..16547afe27 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ec9be33c8a..9b4b1f8ea3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6468,7 +6468,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7127,7 +7127,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12489,7 +12489,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12501,7 +12501,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 3275c5a096..7edaf1042f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 14b6bbbb2e..8cfbe539de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 746d8fe5ce..047362ad8a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f3dcf6c045..5b30b7a74f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6453,7 +6453,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7112,7 +7112,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12474,7 +12474,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12486,7 +12486,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 3275c5a096..7edaf1042f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 24d45b7cfa..cc7179e1eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 746d8fe5ce..047362ad8a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ea15890fa9..b24ed2a2b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6464,7 +6464,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7139,7 +7139,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12516,7 +12516,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12528,7 +12528,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 5259fc9376..4b4af50d5b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d2ea90ce38..8a78e897ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -145,7 +145,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 746d8fe5ce..047362ad8a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 37db88bbb0..69798577c6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6464,7 +6464,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7139,7 +7139,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12516,7 +12516,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12528,7 +12528,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 5259fc9376..4b4af50d5b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d2ea90ce38..8a78e897ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -145,7 +145,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 746d8fe5ce..047362ad8a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -392,9 +392,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; } @@ -406,9 +406,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; } @@ -416,7 +416,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(); @@ -540,7 +540,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(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java index 4f2a5893af..15163a3373 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CheckSexSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index 12456eb0d2..7eff20604c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -141,11 +141,21 @@ public class PlayerAppearance /** * @return true if char is female */ - public boolean getSex() + public boolean isFemale() { return _sex; } + public void setFemale() + { + _sex = true; + } + + public void setMale() + { + _sex = false; + } + /** * @return Sex of the char */ @@ -154,14 +164,6 @@ public class PlayerAppearance return _sex ? Sex.FEMALE : Sex.MALE; } - /** - * @param isfemale - */ - public void setSex(boolean isfemale) - { - _sex = isfemale; - } - public int getNameColor() { return _nameColor; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 37db88bbb0..69798577c6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -6464,7 +6464,7 @@ public class PlayerInstance extends Playable statement.setInt(11, _appearance.getFace()); statement.setInt(12, _appearance.getHairStyle()); statement.setInt(13, _appearance.getHairColor()); - statement.setInt(14, _appearance.getSex() ? 1 : 0); + statement.setInt(14, _appearance.isFemale() ? 1 : 0); statement.setLong(15, getExp()); statement.setLong(16, getSp()); statement.setInt(17, getReputation()); @@ -7139,7 +7139,7 @@ public class PlayerInstance extends Playable statement.setInt(8, _appearance.getFace()); statement.setInt(9, _appearance.getHairStyle()); statement.setInt(10, _appearance.getHairColor()); - statement.setInt(11, _appearance.getSex() ? 1 : 0); + statement.setInt(11, _appearance.isFemale() ? 1 : 0); statement.setInt(12, getHeading()); statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX()); statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY()); @@ -12516,7 +12516,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); } - final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @@ -12528,7 +12528,7 @@ public class PlayerInstance extends Playable return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); } - final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 22d17bdd99..7fcf9182cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -124,7 +124,7 @@ public class Transform implements IIdentifiable { if (creature.isPlayer()) { - return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate); + return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate); } else if (creature.isNpc()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/PlayerClass.java index 739ba086be..ddc41aa4c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/PlayerClass.java @@ -341,7 +341,7 @@ public enum PlayerClass // So, in that situation we must skip sex check if (Config.MAX_SUBCLASS <= 3) { - if (player.getAppearance().getSex()) + if (player.getAppearance().isFemale()) { subclasses.removeAll(EnumSet.of(femaleSoulbreaker)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanMember.java index 65a7dcdca5..06acad430a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanMember.java @@ -100,7 +100,7 @@ public class ClanMember _title = player.getTitle(); _sponsor = 0; _apprentice = 0; - _sex = player.getAppearance().getSex(); + _sex = player.getAppearance().isFemale(); _raceOrdinal = player.getRace().ordinal(); } @@ -122,7 +122,7 @@ public class ClanMember _title = _player.getTitle(); _apprentice = _player.getApprentice(); _sponsor = _player.getSponsor(); - _sex = _player.getAppearance().getSex(); + _sex = _player.getAppearance().isFemale(); _raceOrdinal = _player.getRace().ordinal(); } @@ -328,7 +328,7 @@ public class ClanMember */ public boolean getSex() { - return _player != null ? _player.getAppearance().getSex() : _sex; + return _player != null ? _player.getAppearance().isFemale() : _sex; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index b0cb0abe40..f6f4687f02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition { return false; } - return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex; + return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 5259fc9376..4b4af50d5b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed packet.writeD(_player.getBaseClass()); // Confirmed for (int slot : getPaperdollOrder()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 76f00df31e..00f51beaec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_sessionId); packet.writeD(_player.getClanId()); packet.writeD(0x00); // ?? - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); packet.writeD(0x01); // active ?? diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 20e9cace4e..cb86acd9e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); - packet.writeD(_player.getAppearance().getSex() ? 1 : 0); + packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index d9af227fa0..315cec5322 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket final PlayerInstance player = m.getPlayerInstance(); if (player != null) { - packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect + packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect packet.writeD(player.getRace().ordinal()); // packet.writeD(1); } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d89d4cc607..bf2e41d901 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeString(_player.getName()); packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel());