Extract CommandSender to CommandSource, this should prevent Ess user object leaks.

This commit is contained in:
KHobbits 2013-10-16 20:59:39 +01:00
parent cf9d79d24c
commit 6f85761f7f
145 changed files with 1848 additions and 590 deletions

View file

@ -1,9 +1,9 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.LightningStrike;
import org.bukkit.entity.Player;
@ -18,10 +18,10 @@ public class Commandlightning extends EssentialsLoopCommand
}
@Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
{
User user = null;
if (sender instanceof Player)
if (sender.isPlayer())
{
user = ess.getUser(((Player)sender));
if ((args.length < 1 || user != null && !user.isAuthorized("essentials.lightning.others")))
@ -45,7 +45,7 @@ public class Commandlightning extends EssentialsLoopCommand
}
@Override
protected void updatePlayer(final Server server, final CommandSender sender, final User matchUser, final String[] args)
protected void updatePlayer(final Server server, final CommandSource sender, final User matchUser, final String[] args)
{
sender.sendMessage(_("lightningUse", matchUser.getDisplayName()));
final LightningStrike strike = matchUser.getBase().getWorld().strikeLightningEffect(matchUser.getBase().getLocation());