Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add command logging for CommandBlocks and other console types.

This commit is contained in:
KHobbits 2013-07-02 07:16:42 +01:00
parent 188a214de9
commit 522c3e85b2
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -20,6 +20,7 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.Economy;
import com.earth2me.essentials.api.IJails;
import com.earth2me.essentials.commands.EssentialsCommand;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NoChargeException;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
@ -48,6 +49,8 @@ import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
@ -243,12 +246,13 @@ public class Essentials extends JavaPlugin implements IEssentials
LOGGER.log(Level.INFO, "Essentials load " + timeroutput);
}
}
@Override
public void saveConfig() {
public void saveConfig()
{
// We don't use any of the bukkit config writing, as this breaks our config file formatting.
}
private void registerListeners(PluginManager pm)
{
HandlerList.unregisterAll(this);
@ -356,10 +360,32 @@ public class Essentials extends JavaPlugin implements IEssentials
try
{
User user = null;
Block bSenderBlock = null;
if (sender instanceof Player)
{
user = getUser(sender);
}
else if (sender instanceof BlockCommandSender)
{
BlockCommandSender bsender = (BlockCommandSender)sender;
bSenderBlock = bsender.getBlock();
}
if (bSenderBlock != null)
{
Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[]
{
bSenderBlock.getX(), bSenderBlock.getY(), bSenderBlock.getZ(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
});
}
else if (user == null)
{
Bukkit.getLogger().log(Level.INFO, "{0} issued server command: /{1} {2}", new Object[]
{
sender.getName(), commandLabel, EssentialsCommand.getFinalArg(args, 0)
});
}
// New mail notification
if (user != null && !getSettings().isCommandDisabled("mail") && !command.getName().equals("mail") && user.isAuthorized("essentials.mail"))