Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove sender references when they no longer are needed.

Browse Source
This commit is contained in:
Olof Larsson 2014-09-12 10:19:28 +02:00
parent 2a350698b9
commit a071fd5058
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/massivecraft/massivecore/cmd/MassiveCommand.java
View File

@ -207,18 +207,6 @@ public class MassiveCommand
// The commandChain is a list of the parent command chain used to get to this command. // The commandChain is a list of the parent command chain used to get to this command.
public void execute(CommandSender sender, List<String> args, List<MassiveCommand> commandChain) public void execute(CommandSender sender, List<String> args, List<MassiveCommand> commandChain)
{ {
// Set the execution-time specific variables
this.sender = sender;
this.senderIsConsole = true;
this.me = null;
if (sender instanceof Player)
{
this.me = (Player) sender;
this.senderIsConsole = false;
}
this.fixSenderVars();
this.setArgs(args); this.setArgs(args);
this.setCommandChain(commandChain); this.setCommandChain(commandChain);
@ -240,12 +228,34 @@ public class MassiveCommand
} }
} }
if ( ! validCall(this.sender, this.getArgs())) return; // Set Sender Variables
this.sender = sender;
this.senderIsConsole = true;
this.me = null;
if (sender instanceof Player)
{
this.me = (Player) sender;
this.senderIsConsole = false;
}
this.fixSenderVars();
if ( ! validCall(this.sender, this.getArgs())) return;
perform(); perform();
// Unset Sender Variables
this.sender = null;
this.me = null;
this.unsetSenderVars();
} }
public void fixSenderVars() {}; public void fixSenderVars()
{
}
public void unsetSenderVars()
{
}
public void execute(CommandSender sender, List<String> args) public void execute(CommandSender sender, List<String> args)
{ {