EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Implements some Java 14 code migrations

Browse Source
This commit is contained in:
Kristian Knarvik 2021-10-09 23:41:19 +02:00
parent 3a8943baef
commit 7a9dbb8046
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/knarcraft/stargate/command/CommandReload.java
View File

@ -26,8 +26,7 @@ public class CommandReload implements CommandExecutor {
@Override @Override
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
@NotNull String[] args) { @NotNull String[] args) {
if (commandSender instanceof Player) { if (commandSender instanceof Player player) {
Player player = (Player) commandSender;
if (!player.hasPermission("stargate.reload")) { if (!player.hasPermission("stargate.reload")) {
Stargate.sendErrorMessage(commandSender, "Permission Denied"); Stargate.sendErrorMessage(commandSender, "Permission Denied");
return true; return true;

3
src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java
View File

@ -112,8 +112,7 @@ public class PlayerEventListener implements Listener {
if (playerVehicle != null && !(playerVehicle instanceof Boat) && !(playerVehicle instanceof RideableMinecart)) { if (playerVehicle != null && !(playerVehicle instanceof Boat) && !(playerVehicle instanceof RideableMinecart)) {
//Make sure the horse can be sat on //Make sure the horse can be sat on
if (playerVehicle instanceof AbstractHorse) { if (playerVehicle instanceof AbstractHorse horse) {
AbstractHorse horse = ((AbstractHorse) playerVehicle);
//Make sure the horse is properly tamed //Make sure the horse is properly tamed
if (!horse.isTamed()) { if (!horse.isTamed()) {
horse.setTamed(true); horse.setTamed(true);

3
src/main/java/net/knarcraft/stargate/portal/Portal.java
View File

@ -980,14 +980,13 @@ public class Portal {
*/ */
public final void drawSign() { public final void drawSign() {
BlockState state = getSignLocation().getBlock().getState(); 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.logger.warning(Stargate.getString("prefix") + "Sign block is not a Sign object");
Stargate.debug("Portal::drawSign", "Block: " + getSignLocation().getBlock().getType() + " @ " Stargate.debug("Portal::drawSign", "Block: " + getSignLocation().getBlock().getType() + " @ "
+ getSignLocation().getBlock().getLocation()); + getSignLocation().getBlock().getLocation());
return; return;
} }
Sign sign = (Sign) state;
SignHelper.drawSign(sign, this); SignHelper.drawSign(sign, this);
} }