From 29f709a73e7d8a8e845e9e864fc56670907b725e Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 10 Dec 2022 15:07:33 +0100 Subject: [PATCH] Remove `air` from `unsafe-blocks`. That causes issues in force blocks mode and is checked internally already. --- .../java/de/themoep/randomteleport/RandomTeleport.java | 10 ++++++++-- randomteleport-plugin/src/main/resources/config.yml | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java b/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java index 7e4240b..524e4bd 100644 --- a/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java +++ b/randomteleport-plugin/src/main/java/de/themoep/randomteleport/RandomTeleport.java @@ -102,7 +102,7 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI { .map(s -> { Material mat = Material.matchMaterial(s); if (mat == null) { - getLogger().log(Level.WARNING, "Error in save-blocks config! No material found with name " + s); + getLogger().log(Level.WARNING, "Error in safe blocks config! No material found with name " + s); } return mat; }) @@ -118,7 +118,13 @@ public class RandomTeleport extends JavaPlugin implements RandomTeleportAPI { .map(s -> { Material mat = Material.matchMaterial(s); if (mat == null) { - getLogger().log(Level.WARNING, "Error in unsave-blocks config! No material found with name " + s); + getLogger().log(Level.WARNING, "Error in unsafe blocks config! No material found with name " + s); + } + // Air was in the default for a while now but will cause issues. Don't allow that. + if (mat == Material.AIR) { + getLogger().log(Level.WARNING, "Your list of unsafe blocks contained 'air'!" + + " This will cause issues and has not been loaded. Remove it from your config to remove this warning!"); + return null; } return mat; }) diff --git a/randomteleport-plugin/src/main/resources/config.yml b/randomteleport-plugin/src/main/resources/config.yml index 03a8295..e38a009 100644 --- a/randomteleport-plugin/src/main/resources/config.yml +++ b/randomteleport-plugin/src/main/resources/config.yml @@ -26,7 +26,6 @@ safe-blocks: # Blocks not to teleport on or into unsafe-blocks: -- air - water - lava - oak_sapling