Index: java/net/sf/l2j/gameserver/clientpackets/RequestBypassToServer.java =================================================================== --- java/net/sf/l2j/gameserver/clientpackets/RequestBypassToServer.java (revision 2140) +++ java/net/sf/l2j/gameserver/clientpackets/RequestBypassToServer.java (working copy) @@ -18,11 +18,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.sf.l2j.Config; import net.sf.l2j.gameserver.ai.CtrlIntention; import net.sf.l2j.gameserver.datatables.AdminCommandAccessRights; import net.sf.l2j.gameserver.communitybbs.CommunityBoard; import net.sf.l2j.gameserver.handler.AdminCommandHandler; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; +import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2CharPosition; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; @@ -84,6 +86,8 @@ _log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!"); return; } + + GMAudit.auditGMAction(activeChar.getName(), _command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target")); ach.useAdminCommand(_command, activeChar); } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (working copy) @@ -27,7 +27,6 @@ import net.sf.l2j.gameserver.datatables.TeleportLocationTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; import net.sf.l2j.gameserver.instancemanager.Manager; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Multisell; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.network.SystemMessageId; @@ -71,10 +70,9 @@ "admin_endolympiad" }; - public boolean useAdminCommand(String command, L2PcInstance activeChar) { + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"), ""); - if (command.startsWith("admin_admin")) { showMainPage(activeChar,command); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBan.java (working copy) @@ -25,7 +25,6 @@ import net.sf.l2j.gameserver.LoginServerThread; import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -157,7 +156,6 @@ e.printStackTrace(); } } - GMAudit.auditGMAction(activeChar.getName(), command, player, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminBanChat.java (working copy) @@ -16,7 +16,6 @@ import net.sf.l2j.gameserver.ThreadPoolManager; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -91,8 +90,6 @@ activeChar.sendMessage(targetPlayer.getName() + "'s chat ban has now been lifted."); targetPlayer.setChatBanned(false); } - - GMAudit.auditGMAction(activeChar.getName(), command, targetPlayer.getName(), ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCache.java (working copy) @@ -20,7 +20,6 @@ import net.sf.l2j.gameserver.cache.CrestCache; import net.sf.l2j.gameserver.cache.HtmCache; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; /** @@ -96,7 +95,6 @@ activeChar.sendMessage("Cache[Crest]: crests fixed"); } String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminChangeAccessLevel.java (working copy) @@ -21,7 +21,6 @@ import net.sf.l2j.Config; import net.sf.l2j.L2DatabaseFactory; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.network.SystemMessageId; @@ -43,8 +42,6 @@ { handleChangeLevel(command, activeChar); - String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminCreateItem.java (working copy) @@ -18,7 +18,6 @@ import net.sf.l2j.gameserver.datatables.ItemTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.serverpackets.ItemList; import net.sf.l2j.gameserver.templates.L2Item; @@ -40,9 +39,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"), ""); - if (command.equals("admin_itemcreate")) { AdminHelpPage.showHelpPage(activeChar, "itemcreation.htm"); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDelete.java (working copy) @@ -17,7 +17,6 @@ import net.sf.l2j.gameserver.datatables.SpawnTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; import net.sf.l2j.gameserver.instancemanager.RaidBossSpawnManager; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2Spawn; import net.sf.l2j.gameserver.model.actor.instance.L2NpcInstance; @@ -37,8 +36,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { if (command.equals("admin_delete")) handleDelete(activeChar); - String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDisconnect.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDisconnect.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDisconnect.java (working copy) @@ -16,7 +16,6 @@ import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.serverpackets.LeaveWorld; @@ -40,9 +39,6 @@ { disconnectCharacter(activeChar); } - - String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminDoorControl.java (working copy) @@ -17,7 +17,6 @@ import net.sf.l2j.gameserver.datatables.DoorTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; import net.sf.l2j.gameserver.instancemanager.CastleManager; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2DoorInstance; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -129,7 +128,6 @@ e.printStackTrace(); } String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEditChar.java (working copy) @@ -25,7 +25,6 @@ import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager; import net.sf.l2j.gameserver.datatables.ClanTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -90,9 +89,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target", ""); - if (command.equals("admin_current_player")) { showCharacterInfo(activeChar, null); @@ -177,8 +173,6 @@ { String val = command.substring(15); int karma = Integer.parseInt(val); - if (activeChar == activeChar.getTarget()) - GMAudit.auditGMAction(activeChar.getName(), command, activeChar.getName(), ""); setTargetKarma(activeChar, karma); } catch (Exception e) Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEffects.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEffects.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEffects.java (working copy) @@ -20,7 +20,6 @@ import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager; import net.sf.l2j.gameserver.datatables.SkillTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2Skill; @@ -79,9 +78,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"), ""); - StringTokenizer st = new StringTokenizer(command); st.nextToken(); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEnchant.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEnchant.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEnchant.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.Inventory; import net.sf.l2j.gameserver.model.L2ItemInstance; import net.sf.l2j.gameserver.model.L2Object; @@ -180,9 +179,6 @@ + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + "."); player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + "."); - - // log - GMAudit.auditGMAction(activeChar.getName(), "enchant", player.getName(), itemInstance.getItem().getName() + "(" + itemInstance.getObjectId() + ")" + " from " + curEnchant + " to " + ench); } } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminExpSp.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.network.SystemMessageId; @@ -40,7 +39,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget()!=null ? activeChar.getTarget().getName() : "no-target"), ""); if (command.startsWith("admin_add_exp_sp")) { try Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeodata.java (working copy) @@ -17,7 +17,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.GeoData; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; /** @@ -42,9 +41,6 @@ @SuppressWarnings("deprecation") public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - if (Config.GEODATA < 1) { activeChar.sendMessage("Geo Engine is Turned Off!"); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminGeoEditor.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.geoeditorcon.GeoEditorListener; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; /** @@ -37,9 +36,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - if (!Config.ACCEPT_GEOEDITOR_CONN) { activeChar.sendMessage("Server do not accepts geoeditor connections now."); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminHeal.java (working copy) @@ -18,7 +18,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; @@ -38,8 +37,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"), ""); - if (command.equals("admin_heal")) handleRes(activeChar); else if (command.startsWith("admin_heal")) { Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminInvul.java (working copy) @@ -18,7 +18,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -34,8 +33,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"), ""); - if (command.equals("admin_invul")) handleInvul(activeChar); if (command.equals("admin_setinvul")){ L2Object target = activeChar.getTarget(); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKick.java (working copy) @@ -18,7 +18,6 @@ import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.serverpackets.LeaveWorld; @@ -28,10 +27,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - - String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - if (command.startsWith("admin_kick")) { StringTokenizer st = new StringTokenizer(command); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKill.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKill.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminKill.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; @@ -45,9 +44,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - if (command.startsWith("admin_kill")) { StringTokenizer st = new StringTokenizer(command, " "); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLevel.java (working copy) @@ -27,7 +27,6 @@ import java.util.StringTokenizer; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.model.actor.instance.L2PlayableInstance; @@ -48,12 +47,7 @@ */ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - if (activeChar == null) return false; - - L2Object targetChar = activeChar.getTarget(); - String target = (targetChar != null ? targetChar.getName() : "no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - + L2Object targetChar = activeChar.getTarget(); StringTokenizer st = new StringTokenizer(command, " "); String actualCommand = st.nextToken(); // Get actual command Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMenu.java (working copy) @@ -23,7 +23,6 @@ import net.sf.l2j.L2DatabaseFactory; import net.sf.l2j.gameserver.LoginServerThread; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2Clan; import net.sf.l2j.gameserver.model.L2Object; @@ -53,10 +52,8 @@ "admin_unban_menu" }; - public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { if (command.equals("admin_char_manage")) showMainPage(activeChar); else if (command.startsWith("admin_teleport_character_to_menu")) Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminMobGroup.java (working copy) @@ -16,7 +16,6 @@ import net.sf.l2j.gameserver.datatables.NpcTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2World; import net.sf.l2j.gameserver.model.MobGroup; @@ -44,7 +43,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - GMAudit.auditGMAction(activeChar.getName(), command, "", ""); if (command.equals("admin_mobmenu")) { showMainPage(activeChar,command); Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPledge.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.gameserver.datatables.ClanTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Clan; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; @@ -58,7 +57,6 @@ { String action = null; String parameter = null; - GMAudit.auditGMAction(activeChar.getName(), command, activeChar.getName(), ""); StringTokenizer st = new StringTokenizer(command); try { Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRepairChar.java (working copy) @@ -21,7 +21,6 @@ import net.sf.l2j.L2DatabaseFactory; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; /** @@ -37,9 +36,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - handleRepair(command); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java (working copy) @@ -18,7 +18,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Character; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2World; @@ -41,9 +40,6 @@ public boolean useAdminCommand(String command, L2PcInstance activeChar) { - String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target"; - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); - if (command.startsWith("admin_res ")) handleRes(activeChar, command.split(" ")[1]); else if (command.equals("admin_res")) Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminShop.java (working copy) @@ -19,7 +19,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.TradeController; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2TradeList; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.serverpackets.ActionFailed; @@ -39,7 +38,8 @@ "admin_gmshop" }; - public boolean useAdminCommand(String command, L2PcInstance activeChar) { + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { if (command.startsWith("admin_buy")) { try @@ -56,7 +56,6 @@ AdminHelpPage.showHelpPage(activeChar, "gmshops.htm"); } String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); return true; } Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminSkill.java (working copy) @@ -22,7 +22,6 @@ import net.sf.l2j.gameserver.datatables.SkillTable; import net.sf.l2j.gameserver.datatables.SkillTreeTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2Skill; import net.sf.l2j.gameserver.model.L2SkillLearn; @@ -67,9 +66,8 @@ private static L2Skill[] adminSkills; - public boolean useAdminCommand(String command, L2PcInstance activeChar) { - GMAudit.auditGMAction(activeChar.getName(), command, (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"), ""); - + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { if (command.equals("admin_show_skills")) showMainPage(activeChar); else if (command.startsWith("admin_remove_skills")) Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (working copy) @@ -24,7 +24,6 @@ import net.sf.l2j.gameserver.datatables.NpcTable; import net.sf.l2j.gameserver.datatables.SpawnTable; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2CharPosition; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.L2Spawn; @@ -74,10 +73,9 @@ "admin_teleto", }; - public boolean useAdminCommand(String command, L2PcInstance activeChar) { - + public boolean useAdminCommand(String command, L2PcInstance activeChar) + { String target = (activeChar.getTarget() != null?activeChar.getTarget().getName():"no-target"); - GMAudit.auditGMAction(activeChar.getName(), command, target, ""); if (command.equals("admin_teleto")) { Index: java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTvTEvent.java =================================================================== --- java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTvTEvent.java (revision 2140) +++ java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTvTEvent.java (working copy) @@ -16,7 +16,6 @@ import net.sf.l2j.Config; import net.sf.l2j.gameserver.handler.IAdminCommandHandler; -import net.sf.l2j.gameserver.model.GMAudit; import net.sf.l2j.gameserver.model.L2Object; import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance; import net.sf.l2j.gameserver.model.entity.TvTEvent; @@ -29,32 +28,30 @@ implements IAdminCommandHandler { private static final String[] ADMIN_COMMANDS = {"admin_tvt_add", "admin_tvt_remove"}; - public boolean useAdminCommand( String command, L2PcInstance adminInstance ) + public boolean useAdminCommand( String command, L2PcInstance activeChar ) { - GMAudit.auditGMAction( adminInstance.getName(), command, ( adminInstance.getTarget() != null ? adminInstance.getTarget().getName() : "no-target" ), "" ); - if ( command.equals( "admin_tvt_add" ) ) { - L2Object target = adminInstance.getTarget(); + L2Object target = activeChar.getTarget(); if (!( target instanceof L2PcInstance ) ) { - adminInstance.sendMessage( "You should select a player!" ); + activeChar.sendMessage( "You should select a player!" ); return true; } - add( adminInstance, ( L2PcInstance )target ); + add( activeChar, ( L2PcInstance )target ); } else if ( command.equals( "admin_tvt_remove" ) ) { - L2Object target = adminInstance.getTarget(); + L2Object target = activeChar.getTarget(); if (!( target instanceof L2PcInstance ) ) { - adminInstance.sendMessage( "You should select a player!" ); + activeChar.sendMessage( "You should select a player!" ); return true; } - remove( adminInstance, ( L2PcInstance )target ); + remove( activeChar, ( L2PcInstance )target ); } return true; @@ -65,14 +62,14 @@ return ADMIN_COMMANDS; } - private void add( L2PcInstance adminInstance, L2PcInstance playerInstance ) { + private void add( L2PcInstance activeChar, L2PcInstance playerInstance ) { if ( TvTEvent.isPlayerParticipant( playerInstance.getObjectId() ) ) { - adminInstance.sendMessage( "Player already participated in the event!" ); + activeChar.sendMessage( "Player already participated in the event!" ); return; } if ( !TvTEvent.addParticipant( playerInstance ) ) { - adminInstance.sendMessage( "Player instance could not be added, it seems to be null!" ); + activeChar.sendMessage( "Player instance could not be added, it seems to be null!" ); return; } @@ -81,9 +78,9 @@ } } - private void remove( L2PcInstance adminInstance, L2PcInstance playerInstance ) { + private void remove( L2PcInstance activeChar, L2PcInstance playerInstance ) { if ( !TvTEvent.removeParticipant( playerInstance.getObjectId() ) ) { - adminInstance.sendMessage( "Player is not part of the event!" ); + activeChar.sendMessage( "Player is not part of the event!" ); return; } Index: java/net/sf/l2j/gameserver/model/GMAudit.java =================================================================== --- java/net/sf/l2j/gameserver/model/GMAudit.java (revision 2140) +++ java/net/sf/l2j/gameserver/model/GMAudit.java (working copy) @@ -60,4 +60,9 @@ } } } + + public static void auditGMAction(String gmName, String action, String target) + { + auditGMAction(gmName, action, target, ""); + } } \ No newline at end of file