diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 6394ee8..379ed0f 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -36,6 +36,7 @@ import java.util.List; import java.util.Random; import java.util.UUID; +import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -189,8 +190,13 @@ AllItemsChallenge.start(); } for (String string : getItemConfig().getStringList("items")) { - Material material = Material.valueOf(string); - not_available_materials.add(material); + try { + Material material = Material.valueOf(string); + not_available_materials.add(material); + } catch (IllegalArgumentException ex) { + Bukkit.getLogger().log(Level.INFO, "Some items could not be loaded into the ItemGroup"); + } + } for (Material material : Material.values()) { diff --git a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java index ce09463..ca69366 100644 --- a/src/main/java/de/fanta/challenges/commands/CommandRegistration.java +++ b/src/main/java/de/fanta/challenges/commands/CommandRegistration.java @@ -74,7 +74,9 @@ coordsRouter.addCommandMapping(new CoordsGetCommand(plugin), "get"); coordsRouter.addCommandMapping(new CoordsSaveCommand(plugin), "save"); coordsRouter.addCommandMapping(new CoordsDeleteCommand(), "delete"); - coordsRouter.addCommandMapping(new CoordsTargetCommand(plugin), "target"); + if (plugin.getProtocolVersion() >= 759) { + coordsRouter.addCommandMapping(new CoordsTargetCommand(plugin), "target"); + } CommandRouter hpRouter = new CommandRouter(plugin.getCommand("hp")); hpRouter.addCommandMapping(new HPAddCommand(plugin), "add"); diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java index 6baa4b1..e3094f0 100644 --- a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java +++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java @@ -125,6 +125,9 @@ } } case WORLD_BORDER_LEVEL_INDEX -> { + if (plugin.getProtocolVersion() < 759) { + return; + } if (plugin.getConfig().getBoolean("worldborderlevel")) { GUIUtils.setConfig("worldborderlevel", false); for (Player pp : Bukkit.getOnlinePlayers()) { diff --git a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java index b87e9f1..6782464 100644 --- a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java +++ b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java @@ -51,7 +51,6 @@ pM.registerEvents(new EntityListener(), plugin); pM.registerEvents(new PlayerListener(), plugin); pM.registerEvents(new VoidListener(), plugin); - pM.registerEvents(new CoordsTargeter(), plugin); pM.registerEvents(new WindowManager(), plugin); pM.registerEvents(new EventItemsGui(), plugin); @@ -88,11 +87,15 @@ pM.registerEvents(new IceRunnerChallenge(), plugin); pM.registerEvents(new RandomMobChallenge(), plugin); pM.registerEvents(new BedrockWallChallenge(), plugin); - pM.registerEvents(new WorldBorderLevelChallenge(), plugin); pM.registerEvents(new SammelFieberChallengeEvent(), plugin); pM.registerEvents(new OreBattle(), plugin); pM.registerEvents(new ForceItemChallengeEvent(), plugin); + if (plugin.getProtocolVersion() >= 759) { + pM.registerEvents(new WorldBorderLevelChallenge(), plugin); + pM.registerEvents(new CoordsTargeter(), plugin); + } + pM.registerEvents(new CheckItemsGUI(), plugin); pM.registerEvents(new ForceItemChallengeEvent.AcceptGUI(), plugin);