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

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
View File

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

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java
View File

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

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

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

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java
View File

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