From 72002a3d75ef9178945a6d6e2f1a12a383502be3 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Wed, 21 Apr 2021 11:37:53 +0200
Subject: [PATCH] Wait monitoring should always be enabled

---
 .../java/net/minestom/server/MinecraftServer.java    |  9 ---------
 .../java/net/minestom/server/lock/Acquisition.java   | 12 ++----------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/main/java/net/minestom/server/MinecraftServer.java b/src/main/java/net/minestom/server/MinecraftServer.java
index c7d2c4d4e..1f62869a6 100644
--- a/src/main/java/net/minestom/server/MinecraftServer.java
+++ b/src/main/java/net/minestom/server/MinecraftServer.java
@@ -136,7 +136,6 @@ public final class MinecraftServer {
     private static int compressionThreshold = 256;
     private static boolean packetCaching = true;
     private static boolean groupedPacket = true;
-    private static boolean waitMonitoring = true;
     private static ResponseDataConsumer responseDataConsumer;
     private static String brandName = "Minestom";
     private static Difficulty difficulty = Difficulty.NORMAL;
@@ -614,14 +613,6 @@ public final class MinecraftServer {
         MinecraftServer.groupedPacket = groupedPacket;
     }
 
-    public static boolean hasWaitMonitoring() {
-        return waitMonitoring;
-    }
-
-    public static void setWaitMonitoring(boolean waitMonitoring) {
-        MinecraftServer.waitMonitoring = waitMonitoring;
-    }
-
     /**
      * Gets the consumer executed to show server-list data.
      *
diff --git a/src/main/java/net/minestom/server/lock/Acquisition.java b/src/main/java/net/minestom/server/lock/Acquisition.java
index 0e0ea61ad..269b7354c 100644
--- a/src/main/java/net/minestom/server/lock/Acquisition.java
+++ b/src/main/java/net/minestom/server/lock/Acquisition.java
@@ -1,6 +1,5 @@
 package net.minestom.server.lock;
 
-import net.minestom.server.MinecraftServer;
 import net.minestom.server.thread.BatchThread;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -90,11 +89,7 @@ public final class Acquisition {
 
     protected static ReentrantLock acquireEnter(Thread currentThread, BatchThread elementThread) {
         // Monitoring
-        final boolean monitoring = MinecraftServer.hasWaitMonitoring();
-        long time = 0;
-        if (monitoring) {
-            time = System.nanoTime();
-        }
+        long time = System.nanoTime();
 
         ReentrantLock currentLock;
         {
@@ -118,10 +113,7 @@ public final class Acquisition {
         }
 
         // Monitoring
-        if (monitoring) {
-            time = System.nanoTime() - time;
-            WAIT_COUNTER_NANO.addAndGet(time);
-        }
+        WAIT_COUNTER_NANO.addAndGet(System.nanoTime() - time);
 
         return !acquired ? lock : null;
     }