diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java b/src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java index 07063df2..66c408a1 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java @@ -29,12 +29,8 @@ public class PlayerListenerHigherThan18 implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void onSwitchHand(PlayerSwapHandItemsEvent event) { Player player = event.getPlayer(); - if ((!player.isSneaking() || !player.hasPermission("keybindings.use")) && - settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) { - return; - } - event.setCancelled(true); - if (settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) { + if (player.isSneaking() && player.hasPermission("keybindings.use") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) { + event.setCancelled(true); Bukkit.dispatchCommand(event.getPlayer(), "help"); } } diff --git a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java index a66dbbed..1db3b3f7 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java @@ -14,7 +14,7 @@ public final class PluginSettings implements SettingsHolder { "If you are using TrMenu, don't enable this because TrMenu already implemented this." }) public static final Property MENU_UNREGISTER_COMPATIBILITY = - newProperty("3rdPartyFeature.compatibility.menuPlugins", true); + newProperty("3rdPartyFeature.compatibility.menuPlugins", false); @Comment({ "Do you want to enable the session feature?",