Improved admin setclass sex check.
This commit is contained in:
@@ -393,8 +393,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -404,8 +407,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1729,7 +1729,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -393,8 +393,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -404,8 +407,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -393,8 +393,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -404,8 +407,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1732,7 +1732,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -393,8 +393,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -404,8 +407,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1732,7 +1732,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -376,13 +376,52 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
player.setBaseClass(classidval);
|
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();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
player.storeMe();
|
player.storeMe();
|
||||||
player.sendMessage("A GM changed your class to " + newclass + ".");
|
player.sendMessage("A GM changed your class to " + newclass + ".");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
activeChar.sendMessage(player.getName() + " is a " + newclass + ".");
|
activeChar.sendMessage(player.getName() + " is a " + newclass + ".");
|
||||||
|
|
||||||
// If necessary transform-untransform player quickly to force the client to reload the character textures
|
// 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);
|
TransformData.getInstance().transformPlayer(105, player);
|
||||||
ThreadPool.schedule(new Untransform(player), 200);
|
ThreadPool.schedule(new Untransform(player), 200);
|
||||||
|
@@ -389,8 +389,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -400,8 +403,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -389,8 +389,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 131: // Doombringer
|
case 131: // Doombringer
|
||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
|
{
|
||||||
|
if (player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setSex(false);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 124: // Soldier (Female)
|
case 124: // Soldier (Female)
|
||||||
@@ -400,8 +403,11 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 133: // Soul Hound (Female)
|
case 133: // Soul Hound (Female)
|
||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
|
{
|
||||||
|
if (!player.getAppearance().getSex())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setSex(true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -92,7 +92,7 @@ public class LongTimeEvent extends Quest
|
|||||||
{
|
{
|
||||||
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
|
||||||
ThreadPool.schedule(new ScheduleStart(), delay);
|
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
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1731,7 +1731,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
_log.log(Level.WARNING, "could not delete char quest:", e);
|
_log.log(Level.WARNING, "Unable to delete char quest!", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user