diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index b25ae58..5fd8db0 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -73,6 +73,8 @@ private ServerType serverType; + private int protocolVersion; + public static Challenges getPlugin() { return plugin; } @@ -83,6 +85,8 @@ plugin = this; nmsUtils = getServer().getServicesManager().load(NMSUtils.class); + protocolVersion = Bukkit.getUnsafe().getProtocolVersion(); + this.timer = new Timer(this); this.rndDrops = new RandomDropsChallenge(); @@ -101,7 +105,6 @@ createAllItemsConfig(); createBackpackConfig(); - serverType = ServerType.valueOf(getServerConfig().getString("servertype")); String prefix = serverType.getPrefix(); @@ -109,7 +112,6 @@ GUIPREFIX = ChatUtil.GREEN + prefix; this.backpack.loadInventoryFromConfig(); - getLogger().info("Plugin loaded!"); this.sbManager = new ScoreBoardManager(this); Bukkit.getScheduler().scheduleSyncDelayedTask(this, () -> { @@ -187,7 +189,7 @@ EventRegistration.pM.callEvent(new TimerChangedEvent(timer.isRunning())); EventRegistration.pM.callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); }, 200L); - + getLogger().info("Plugin loaded!"); } @Override @@ -313,7 +315,6 @@ metalore.addAll(Arrays.asList(lore)); } meta.setLore(metalore); - item.setItemMeta(meta); } return item; } @@ -448,4 +449,8 @@ public String getGUIPREFIX() { return GUIPREFIX; } + + public int getProtocolVersion() { + return protocolVersion; + } } diff --git a/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java b/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java index 0913e83..0bd7301 100644 --- a/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java +++ b/src/main/java/de/fanta/challenges/listeners/BlockDestroyListener.java @@ -34,9 +34,8 @@ public void onBlockDrop(BlockDropItemEvent e) { if (plugin.getConfig().getBoolean("silkore")) { Block block = e.getBlock(); - int minecraftVersion = Integer.parseInt(Bukkit.getMinecraftVersion().replace(".", "")); Material dropType; - if (minecraftVersion > 1179) { + if (plugin.getProtocolVersion() > 754) { dropType = switch (e.getBlockState().getType()) { case IRON_ORE, DEEPSLATE_IRON_ORE -> Material.IRON_INGOT; case GOLD_ORE, DEEPSLATE_GOLD_ORE -> Material.GOLD_INGOT;