From 7eef87b2e0e94c10ecc8532c569ad516ca107236 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 13 Jul 2020 07:39:16 -0700
Subject: [PATCH] Turn off unused NMS compatibility layers

---
 Changelog.txt                                 |  1 +
 .../util/compat/CompatibilityManager.java     | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 364bac92f..57abaea1c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -3,6 +3,7 @@ Version 2.1.133
     French locale has been updated (thanks Elikill58)
     Another fix has been deployed to prevent mobs from having hearts in player death messages (thanks FrankHeijden)
     Players no longer ready their tool if they don't have access to the skill (thanks Draycia)
+    Unused NMS compatibility layers have been disabled for now (expect them to be used in the future for 1.12/1.8 support stuff)
 
 Version 2.1.132
     A fix is in place to prevent an exploit from working that is due to a yet to be patched Spigot server software bug
diff --git a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java
index e5d3a481a..ae0532ccb 100644
--- a/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java
+++ b/src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java
@@ -51,20 +51,22 @@ public class CompatibilityManager {
      * For any unsupported layers, load a dummy layer
      */
     private void initCompatibilityLayers() {
-        if(nmsVersion == NMSVersion.UNSUPPORTED) {
-            mcMMO.p.getLogger().info("NMS not supported for this version of Minecraft, possible solutions include updating mcMMO or updating your server software. NMS Support is not available on every version of Minecraft.");
-            mcMMO.p.getLogger().info("Certain features of mcMMO that require NMS will be disabled, you can check what is disabled by running the /mmocompat command!");
-            //Load dummy compatibility layers
-            isFullyCompatibleServerSoftware = false;
-            loadDummyCompatibilityLayers();
-        } else {
-            playerAttackCooldownExploitPreventionLayer = new PlayerAttackCooldownExploitPreventionLayer(nmsVersion);
+        isFullyCompatibleServerSoftware = true;
 
-            //Mark as operational
-            if(playerAttackCooldownExploitPreventionLayer.noErrorsOnInitialize()) {
-                supportedLayers.put(CompatibilityType.PLAYER_ATTACK_COOLDOWN_EXPLOIT_PREVENTION, true);
-            }
-        }
+//        if(nmsVersion == NMSVersion.UNSUPPORTED) {
+//            mcMMO.p.getLogger().info("NMS not supported for this version of Minecraft, possible solutions include updating mcMMO or updating your server software. NMS Support is not available on every version of Minecraft.");
+//            mcMMO.p.getLogger().info("Certain features of mcMMO that require NMS will be disabled, you can check what is disabled by running the /mmocompat command!");
+//            //Load dummy compatibility layers
+//            isFullyCompatibleServerSoftware = false;
+//            loadDummyCompatibilityLayers();
+//        } else {
+//            playerAttackCooldownExploitPreventionLayer = new PlayerAttackCooldownExploitPreventionLayer(nmsVersion);
+//
+//            //Mark as operational
+//            if(playerAttackCooldownExploitPreventionLayer.noErrorsOnInitialize()) {
+//                supportedLayers.put(CompatibilityType.PLAYER_ATTACK_COOLDOWN_EXPLOIT_PREVENTION, true);
+//            }
+//        }
     }
 
     private void loadDummyCompatibilityLayers() {