Skip to content

Commit e1a6b25

Browse files
committed
Fixed more NPEs and some minor changes
1 parent d3842e4 commit e1a6b25

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

src/main/java/io/github/bilektugrul/simpleservertools/commands/DisposalCommand.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
1515
if (sender instanceof Player && sender.hasPermission("sst.disposal")) {
1616
Player player = (Player) sender;
1717
player.openInventory(Bukkit.getServer().createInventory(player, 54, Utils.getMessage("disposal.title", player)));
18+
} else {
19+
sender.sendMessage(Utils.getMessage("no-permission", sender));
1820
}
1921
return true;
2022
}

src/main/java/io/github/bilektugrul/simpleservertools/commands/FeedCommand.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
1818
return true;
1919
}
2020

21-
Player feedPlayer;
21+
Player feedPlayer = null;
2222

2323
if (args.length >= 1) {
2424
if (sender.hasPermission("sst.feed.others")) {
@@ -29,7 +29,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
2929
}
3030
} else if (sender instanceof Player) {
3131
feedPlayer = (Player) sender;
32-
} else {
32+
}
33+
34+
if (feedPlayer == null) {
3335
sender.sendMessage(Utils.getMessage("feed.not-found", sender));
3436
return true;
3537
}

src/main/java/io/github/bilektugrul/simpleservertools/commands/HealCommand.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
1818
return true;
1919
}
2020

21-
Player healPlayer;
21+
Player healPlayer = null;
2222

2323
if (args.length >= 1) {
2424
if (sender.hasPermission("sst.heal.others")) {
@@ -29,7 +29,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
2929
}
3030
} else if (sender instanceof Player) {
3131
healPlayer = (Player) sender;
32-
} else {
32+
}
33+
34+
if (healPlayer == null) {
3335
sender.sendMessage(Utils.getMessage("heal.not-found", sender));
3436
return true;
3537
}

src/main/java/io/github/bilektugrul/simpleservertools/commands/tpa/TPACommand.java

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
7777
} else {
7878
p.sendMessage(Utils.getMessage("tpa.not-found", p));
7979
}
80+
} else {
81+
sender.sendMessage(Utils.getMessage("no-permission", sender));
8082
}
8183
return true;
8284
}

src/main/resources/language/messages_en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ messages:
219219
220220
clear-chat:
221221
lines: 100
222-
cleared: '%prefix% &3Chat has been cleaned by &b%executor% &3.' # if you set this message to '', it won't be broadcasted.
222+
cleared: '%prefix% &3Chat has been cleaned by &b%executor%&3.' # if you set this message to '', it won't be broadcasted.
223223
for-staffs:
224224
enabled: true # true = staffs' chat won't be cleaned.
225225

0 commit comments

Comments
 (0)