Skip to content
Snippets Groups Projects
Commit 513848c7 authored by Zoey76's avatar Zoey76
Browse files

BETA: NPE vulnerability fix.

	* Closing #5358
parent 469c295b
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,6 @@ public class AdminAdmin implements IAdminCommandHandler ...@@ -87,7 +87,6 @@ public class AdminAdmin implements IAdminCommandHandler
@Override @Override
public boolean useAdminCommand(String command, L2PcInstance activeChar) public boolean useAdminCommand(String command, L2PcInstance activeChar)
{ {
if (command.startsWith("admin_admin")) if (command.startsWith("admin_admin"))
{ {
showMainPage(activeChar, command); showMainPage(activeChar, command);
...@@ -137,22 +136,18 @@ public class AdminAdmin implements IAdminCommandHandler ...@@ -137,22 +136,18 @@ public class AdminAdmin implements IAdminCommandHandler
{ {
_log.warning("An error occured while ending olympiad: " + e); _log.warning("An error occured while ending olympiad: " + e);
} }
activeChar.sendMessage("Heroes formed"); activeChar.sendMessage("Heroes formed.");
} }
else if (command.startsWith("admin_manualhero") || command.startsWith("admin_sethero")) else if (command.startsWith("admin_manualhero") || command.startsWith("admin_sethero"))
{ {
L2PcInstance target = null; if (activeChar.getTarget() == null)
if (activeChar.getTarget().isPlayer())
{ {
target = activeChar.getTarget().getActingPlayer(); activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
target.setHero(target.isHero() ? false : true); return false;
}
else
{
target = activeChar;
target.setHero(target.isHero() ? false : true);
} }
final L2PcInstance target = activeChar.getTarget().isPlayer() ? activeChar.getTarget().getActingPlayer() : activeChar;
target.setHero(!target.isHero());
target.broadcastUserInfo(); target.broadcastUserInfo();
} }
else if (command.startsWith("admin_diet")) else if (command.startsWith("admin_diet"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment