From 7a9dbb804641c2dda42107cc3a5ef9e7f10abd89 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sat, 9 Oct 2021 23:41:19 +0200 Subject: [PATCH] Implements some Java 14 code migrations --- .../java/net/knarcraft/stargate/command/CommandReload.java | 3 +-- .../net/knarcraft/stargate/listener/PlayerEventListener.java | 3 +-- src/main/java/net/knarcraft/stargate/portal/Portal.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/command/CommandReload.java b/src/main/java/net/knarcraft/stargate/command/CommandReload.java index 79ba7fe..73cdf93 100644 --- a/src/main/java/net/knarcraft/stargate/command/CommandReload.java +++ b/src/main/java/net/knarcraft/stargate/command/CommandReload.java @@ -26,8 +26,7 @@ public class CommandReload implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] args) { - if (commandSender instanceof Player) { - Player player = (Player) commandSender; + if (commandSender instanceof Player player) { if (!player.hasPermission("stargate.reload")) { Stargate.sendErrorMessage(commandSender, "Permission Denied"); return true; diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java index d9e6bb5..9cfc4f3 100644 --- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java @@ -112,8 +112,7 @@ public class PlayerEventListener implements Listener { if (playerVehicle != null && !(playerVehicle instanceof Boat) && !(playerVehicle instanceof RideableMinecart)) { //Make sure the horse can be sat on - if (playerVehicle instanceof AbstractHorse) { - AbstractHorse horse = ((AbstractHorse) playerVehicle); + if (playerVehicle instanceof AbstractHorse horse) { //Make sure the horse is properly tamed if (!horse.isTamed()) { horse.setTamed(true); diff --git a/src/main/java/net/knarcraft/stargate/portal/Portal.java b/src/main/java/net/knarcraft/stargate/portal/Portal.java index 0f10221..072dc7d 100644 --- a/src/main/java/net/knarcraft/stargate/portal/Portal.java +++ b/src/main/java/net/knarcraft/stargate/portal/Portal.java @@ -980,14 +980,13 @@ public class Portal { */ public final void drawSign() { BlockState state = getSignLocation().getBlock().getState(); - if (!(state instanceof Sign)) { + if (!(state instanceof Sign sign)) { Stargate.logger.warning(Stargate.getString("prefix") + "Sign block is not a Sign object"); Stargate.debug("Portal::drawSign", "Block: " + getSignLocation().getBlock().getType() + " @ " + getSignLocation().getBlock().getLocation()); return; } - Sign sign = (Sign) state; SignHelper.drawSign(sign, this); }