Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-27 23:27:33 +02:00
Code Issues Projects Releases Wiki Activity

Fix NPE when teleporting offline players (#4332)

Browse Source
This commit is contained in:
triagonal 2021-07-08 23:24:40 +10:00 committed by GitHub
parent cba5063b33
commit a098055fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/main/java/com/earth2me/essentials/commands/Commandtp.java
View File

@ -25,7 +25,6 @@ public class Commandtp extends EssentialsCommand {
switch (args.length) { switch (args.length) {
case 0: case 0:
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
case 1: case 1:
final User player = getPlayer(server, user, args, 0, false, true); final User player = getPlayer(server, user, args, 0, false, true);
@ -33,8 +32,11 @@ public class Commandtp extends EssentialsCommand {
throw new Exception(tl("teleportDisabled", player.getDisplayName())); throw new Exception(tl("teleportDisabled", player.getDisplayName()));
} }
if (!player.getBase().isOnline() && user.isAuthorized("essentials.tpoffline")) { if (!player.getBase().isOnline()) {
throw new Exception(tl("teleportOffline", player.getDisplayName())); if (user.isAuthorized("essentials.tpoffline")) {
throw new Exception(tl("teleportOffline", player.getDisplayName()));
}
throw new PlayerNotFoundException();
} }
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) { if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) {