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

Improved admin setclass sex check.

Browse Source
This commit is contained in:
MobiusDev
2018-04-07 17:40:15 +00:00
parent c3aa7cda5f
commit ecfee7dd5f
19 changed files with 100 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -394,7 +394,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -405,7 +408,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1729,7 +1729,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -394,7 +394,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -405,7 +408,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -394,7 +394,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -405,7 +408,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1732,7 +1732,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}

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

@@ -394,7 +394,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -405,7 +408,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1732,7 +1732,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}

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

@@ -376,13 +376,52 @@ public class AdminEditChar implements IAdminCommandHandler
{
player.setBaseClass(classidval);
}
// Sex checks.
boolean sexChange = false;
if (player.getRace().equals(Race.KAMAEL))
{
switch (classidval)
{
case 123: // Soldier (Male)
case 125: // Trooper
case 127: // Berserker
case 128: // Soul Breaker (Male)
case 131: // Doombringer
case 132: // Soul Hound (Male)
{
if (player.getAppearance().getSex())
{
sexChange = true;
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
case 126: // Warder
case 129: // Soul Breaker (Female)
case 130: // Arbalester
case 133: // Soul Hound (Female)
case 134: // Trickster
{
if (!player.getAppearance().getSex())
{
sexChange = true;
player.getAppearance().setSex(true);
}
break;
}
}
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
player.storeMe();
player.sendMessage("A GM changed your class to " + newclass + ".");
player.broadcastUserInfo();
activeChar.sendMessage(player.getName() + " is a " + newclass + ".");
// If necessary transform-untransform player quickly to force the client to reload the character textures
if ((race != player.getRace()) || (((race == Race.HUMAN) || (race == Race.ORC)) && (isMage != player.isMageClass())))
if (sexChange || (race != player.getRace()) || (((race == Race.HUMAN) || (race == Race.ORC)) && (isMage != player.isMageClass())))
{
TransformData.getInstance().transformPlayer(105, player);
ThreadPool.schedule(new Untransform(player), 200);

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -390,7 +390,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -401,7 +404,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -390,7 +390,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 132: // Soul Hound (Male)
case 157: // Tyrr Doombringer
{
player.getAppearance().setSex(false);
if (player.getAppearance().getSex())
{
player.getAppearance().setSex(false);
}
break;
}
case 124: // Soldier (Female)
@@ -401,7 +404,10 @@ public class AdminEditChar implements IAdminCommandHandler
case 134: // Trickster
case 165: // Yul Trickster
{
player.getAppearance().setSex(true);
if (!player.getAppearance().getSex())
{
player.getAppearance().setSex(true);
}
break;
}
}

2
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
View File

@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
{
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
ThreadPool.schedule(new ScheduleStart(), delay);
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getEndDate());
_log.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate());
}
else
{

2
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
}
catch (Exception e)
{
_log.log(Level.WARNING, "could not delete char quest:", e);
_log.log(Level.WARNING, "Unable to delete char quest!", e);
}
}