TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-19 06:58:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix NPE in /clearinventory. Fixes #1755 (#1756)

Browse source 
Issue was a NullPointerException due to senderUser not being null-checked. I opted to place the couple of lines of code into the sender.isPlayer() check as opposed to null-checking.
This commit is contained in:
Drew Mitchell 2018-01-06 19:45:19 -06:00 committed by Ali 'SupaHam' M
parent fd6717d06d
commit 50e2d27d5b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/commands/Commandclearinventory.java
View file

@ -43,13 +43,15 @@ public class Commandclearinventory extends EssentialsCommand {
throws Exception { throws Exception {
Collection<Player> players = new ArrayList<Player>(); Collection<Player> players = new ArrayList<Player>();
User senderUser = ess.getUser(sender.getPlayer()); User senderUser = ess.getUser(sender.getPlayer());
// Clear previous command execution before potential errors to reset confirmation. String previousClearCommand = "";
String previousClearCommand = senderUser.getConfirmingClearCommand();
senderUser.setConfirmingClearCommand(null);
int offset = 0; int offset = 0;
if (sender.isPlayer()) { if (sender.isPlayer()) {
players.add(sender.getPlayer()); players.add(sender.getPlayer());
// Clear previous command execution before potential errors to reset confirmation.
previousClearCommand = senderUser.getConfirmingClearCommand();
senderUser.setConfirmingClearCommand(null);
} }
if (allowAll && args.length > 0 && args[0].contentEquals("*")) { if (allowAll && args.length > 0 && args[0].contentEquals("*")) {