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

Fixed admin untransform command NPE.

Browse Source
This commit is contained in:
MobiusDev
2019-01-14 22:03:28 +00:00
parent db96c41e5c
commit aa222abbbc
11 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -47,15 +47,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTransform.java vendored
View File

@@ -46,15 +46,14 @@ public class AdminTransform implements IAdminCommandHandler
} }
else if (command.startsWith("admin_untransform")) else if (command.startsWith("admin_untransform"))
{ {
final L2Object obj = activeChar.getTarget(); final L2Object obj = activeChar.getTarget() == null ? activeChar : activeChar.getTarget();
if (obj.isCharacter()) if (!obj.isCharacter() || !((L2Character) obj).isTransformed())
{
((L2Character) obj).stopTransformation(true);
}
else
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
} }
((L2Character) obj).stopTransformation(true);
} }
else if (command.startsWith("admin_transform")) else if (command.startsWith("admin_transform"))
{ {