Merge branch '2.x' into fix/ignore-yourself

EssentialsX · Aug 24, 2023 · 786b088 · 786b088
2 parents 0a8d4a3 + 42071f4
commit 786b088
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java b/Essentials/src/main/java/com/earth2me/essentials/userstorage/ModernUserMap.java
@@ -42,7 +42,7 @@ public ModernUserMap(final IEssentials ess) {
         // -Dnet.essentialsx.usermap.print-stack=true
         final String printStackProperty = System.getProperty("net.essentialsx.usermap.print-stack", "false");
         // -Dnet.essentialsx.usermap.max-warns=20
-        final String maxWarnProperty = System.getProperty("net.essentialsx.usermap.max-warns", "100");
+        final String maxWarnProperty = System.getProperty("net.essentialsx.usermap.max-warns", "10");
         // -Dnet.essentialsx.usermap.log-cache=true
         final String logCacheProperty = System.getProperty("net.essentialsx.usermap.log-cache", "false");
 
@@ -139,7 +139,9 @@ public User loadUncachedUser(final Player base) {
             debugLogUncachedNonPlayer(base);
             user = new User(base, ess);
         } else if (!base.equals(user.getBase())) {
-            ess.getLogger().log(Level.INFO, "Essentials updated the underlying Player object for " + user.getUUID());
+            if (ess.getSettings().isDebug()) {
+                ess.getLogger().log(Level.INFO, "Essentials updated the underlying Player object for " + user.getUUID());
+            }
             user.update(base);
         }
         uuidCache.updateCache(user.getUUID(), user.getName());