diff --git a/Changelog.txt b/Changelog.txt index 38ab24c94..cc8744ca1 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,9 @@ Key: ! Change - Removal +Version 2.1.3 + Temporarily removed the unarmed no-item pickup feature until its fixed + Version 2.1.2 (Compatibility) mcMMO now deals custom damage type for all damage sources to be more compatible with other plugins (such as anti-cheat) (Perks) Fixed a bug where the Lucky perk wasn't adding to success diff --git a/pom.xml b/pom.xml index 29fca86b4..11ea5980c 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.2 + 2.1.3-SNAPSHOT mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 6892257c7..fb1911d7d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -393,16 +393,16 @@ public class PlayerListener implements Listener { } } - if (player.getInventory().getItemInMainHand().getType() == Material.AIR) { + /*if (player.getInventory().getItemInMainHand().getType() == Material.AIR) { Unarmed.handleItemPickup(player, event); - /*boolean cancel = Config.getInstance().getUnarmedItemPickupDisabled() || pickupSuccess; + *//*boolean cancel = Config.getInstance().getUnarmedItemPickupDisabled() || pickupSuccess; event.setCancelled(cancel); if (pickupSuccess) { return; - }*/ - } + }*//* + }*/ } }