From 9f89b8c2665a4f33d996f0ee9937a7fb11ef7e74 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Wed, 12 Aug 2020 23:04:27 +0200 Subject: [PATCH] Update for MC 1.16.2 --- .../Minepacks/Bukkit/Command/InventoryClearCommand.java | 5 ++--- .../src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java index 55bd38b..f466f52 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java @@ -17,8 +17,8 @@ package at.pcgamingfreaks.Minepacks.Bukkit.Command; +import at.pcgamingfreaks.Bukkit.Command.RegisterablePluginCommand; import at.pcgamingfreaks.Bukkit.Message.Message; -import at.pcgamingfreaks.Bukkit.RegisterablePluginCommand; import at.pcgamingfreaks.Bukkit.Util.Utils; import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearEvent; import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent; @@ -72,14 +72,13 @@ private void clearInventory(Player player, CommandSender sender) if(sender.equals(player)) { messageOwnInventoryCleared.send(player); - Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender)); } else { messageInventoryWasCleared.send(player, sender.getName(), (sender instanceof Player) ? ((Player) sender).getDisplayName() : ChatColor.GRAY + sender.getName()); messageOtherInventoryCleared.send(sender, player.getName(), player.getDisplayName()); - Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender)); } + Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender)); } @Override diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java index 7882ae9..f8a85c0 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java @@ -118,7 +118,7 @@ public void onEnable() private boolean checkMcVersion() { - if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R1)) + if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R2)) { this.warnOnVersionIncompatibility(); this.setEnabled(false); diff --git a/pom.xml b/pom.xml index c5ac62d..cf0e57e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ pom - 2.3.16 + 2.3.17 UTF-8 UTF-8