minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-01 08:36:48 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java
View File

@@ -1,10 +1,10 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.User;
import java.util.List;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -15,7 +15,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
super(command);
}
protected void loopOfflinePlayers(final Server server, final CommandSender sender, final boolean multipleStringMatches, final String searchTerm, final String[] commandArgs)
protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final String searchTerm, final String[] commandArgs)
throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException
{
if (searchTerm.isEmpty())
@@ -33,7 +33,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
}
else if (searchTerm.contentEquals("*"))
{
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.vanish.interact");
for (Player onlinePlayer : server.getOnlinePlayers())
{
final User onlineUser = ess.getUser(onlinePlayer);
@@ -69,7 +69,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
}
}
protected void loopOnlinePlayers(final Server server, final CommandSender sender, final boolean multipleStringMatches, final String searchTerm, final String[] commandArgs)
protected void loopOnlinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final String searchTerm, final String[] commandArgs)
throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException
{
if (searchTerm.isEmpty())
@@ -77,7 +77,7 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
throw new PlayerNotFoundException();
}
boolean skipHidden = sender instanceof Player && !ess.getUser(sender).isAuthorized("essentials.vanish.interact");
boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.vanish.interact");
if (searchTerm.contentEquals("**") || searchTerm.contentEquals("*"))
{
@@ -121,6 +121,6 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand
}
}
protected abstract void updatePlayer(Server server, CommandSender sender, User user, String[] args)
protected abstract void updatePlayer(Server server, CommandSource sender, User user, String[] args)
throws NotEnoughArgumentsException, PlayerExemptException, ChargeException;
}