From ea420ab05f3fee65bf1d9011e0b5cfa74e531866 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Wed, 25 Nov 2015 00:43:55 +0700 Subject: [PATCH] set protect inventory to false in config file if protocol lib is not found. --- src/main/java/fr/xephi/authme/AuthMe.java | 15 ++++++++++----- .../java/fr/xephi/authme/settings/Settings.java | 4 ---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 37d57444..2fd5d980 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -692,16 +692,21 @@ public class AuthMe extends JavaPlugin { if (Settings.protectInventoryBeforeLogInEnabled) { ConsoleLogger.showError("WARNING!!! The protectInventory feature requires ProtocolLib! Disabling it..."); Settings.protectInventoryBeforeLogInEnabled = false; + getSettings().set("settings.restrictions.ProtectInventoryBeforeLogIn", false); } return; } if (Settings.protectInventoryBeforeLogInEnabled) { - inventoryProtector = new AuthMeInventoryPacketAdapter(this); - inventoryProtector.register(); - } else if (inventoryProtector != null) { - ProtocolLibrary.getProtocolManager().removePacketListener(inventoryProtector); - inventoryProtector = null; + if (inventoryProtector == null) { + inventoryProtector = new AuthMeInventoryPacketAdapter(this); + inventoryProtector.register(); + } + } else { + if (inventoryProtector != null) { + ProtocolLibrary.getProtocolManager().removePacketListener(inventoryProtector); + inventoryProtector = null; + } } } diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index ad501994..11ec0a39 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -621,10 +621,6 @@ public final class Settings extends YamlConfiguration { set("Email.emailBlacklisted", new ArrayList()); changes = true; } - if (contains("Performances.useMultiThreading")) { - set("Performances.useMultiThreading", null); - changes = true; - } if (contains("Performances")) { set("Performances", null); changes = true;