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

Better getter and setter naming for player sex.

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

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

@@ -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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java vendored
View File

@@ -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;

14
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java
View File

@@ -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()

8
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -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()

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java
View File

@@ -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)

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

@@ -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));
}

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/ClanMember.java
View File

@@ -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;
}
/**

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java
View File

@@ -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);
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@@ -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())

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
View File

@@ -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 ??

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
View File

@@ -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());

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@@ -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

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@@ -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();
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
View File

@@ -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());