Hopefully fix CME in client permissions manager, closes #25

Mumfrey
1 parent 7b19b205
Showing 1 changed file with 40 additions and 22 deletions
src/main/java/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
@@ -47,37 +47,37 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
      * Permissions permissible which is a proxy for permissions that are common
      * to all mods.
      */
-    private static Permissible allMods = new PermissibleAllMods();
-
-    /**
-     * Minecraft instance 
-     */
-    private GameEngine<?, ?> engine;
+    private final static Permissible allMods = new PermissibleAllMods();
     /**
      * List of registered client mods supporting permissions
      */
-    private Map<String, Permissible> registeredClientMods = new HashMap<String, Permissible>();
+    private final Map<String, Permissible> registeredClientMods = new HashMap<String, Permissible>();
     /**
      * List of registered client permissions, grouped by mod
      */
-    private Map<Permissible, TreeSet<String>> registeredClientPermissions = new HashMap<Permissible, TreeSet<String>>();
+    private final Map<Permissible, TreeSet<String>> registeredClientPermissions = new HashMap<Permissible, TreeSet<String>>();
     /**
      * Objects which listen to events generated by this object
      */
-    private Set<Permissible> permissibles = new HashSet<Permissible>();
+    private final Set<Permissible> permissibles = new HashSet<Permissible>();
     /**
      * Local permissions, used when server permissions are not available
      */
-    private LocalPermissions localPermissions = new LocalPermissions();
+    private final LocalPermissions localPermissions = new LocalPermissions();
     /**
      * Server permissions, indexed by mod
      */
-    private Map<String, ServerPermissions> serverPermissions = new HashMap<String, ServerPermissions>();
+    private final Map<String, ServerPermissions> serverPermissions = new HashMap<String, ServerPermissions>();
+
+    /**
+     * Minecraft instance 
+     */
+    private GameEngine<?, ?> engine;
     /**
      * Last time onTick was called, used to detect tamper condition if no ticks
@@ -124,8 +124,11 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         if (mod == null) mod = allMods;
         String modName = mod.getPermissibleModName();
-        ServerPermissions modPermissions = this.serverPermissions.get(modName);
-        return modPermissions != null ? modPermissions : this.localPermissions;
+        synchronized (this.serverPermissions)
+        {
+            ServerPermissions modPermissions = this.serverPermissions.get(modName);
+            return modPermissions != null ? modPermissions : this.localPermissions;
+        }
     }
     /* (non-Javadoc)
@@ -138,8 +141,11 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         if (mod == null) mod = allMods;
         String modName = mod.getPermissibleModName();
-        ServerPermissions modPermissions = this.serverPermissions.get(modName);
-        return modPermissions != null ? modPermissions.getReplicationTime() : 0;
+        synchronized (this.serverPermissions)
+        {
+            ServerPermissions modPermissions = this.serverPermissions.get(modName);
+            return modPermissions != null ? modPermissions.getReplicationTime() : 0;
+        }
     }
     /**
@@ -208,7 +214,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
      */
     protected void clearServerPermissions()
     {
-        this.serverPermissions.clear();
+        synchronized (this.serverPermissions)
+        {
+            this.serverPermissions.clear();
+        }
         for (Permissible permissible : this.permissibles)
         {
@@ -264,7 +273,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
         }
         else
         {
-            this.serverPermissions.remove(modName);
+            synchronized (this.serverPermissions)
+            {
+                this.serverPermissions.remove(modName);
+            }
         }
     }
@@ -289,12 +301,15 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
             }
         }
-        for (Map.Entry<String, ServerPermissions> modPermissions : this.serverPermissions.entrySet())
+        synchronized (this.serverPermissions)
         {
-            if (!modPermissions.getValue().isValid())
+            for (Map.Entry<String, ServerPermissions> modPermissions : this.serverPermissions.entrySet())
             {
-                modPermissions.getValue().notifyRefreshPending();
-                this.sendPermissionQuery(this.registeredClientMods.get(modPermissions.getKey()));
+                if (!modPermissions.getValue().isValid())
+                {
+                    modPermissions.getValue().notifyRefreshPending();
+                    this.sendPermissionQuery(this.registeredClientMods.get(modPermissions.getKey()));
+                }
             }
         }
@@ -336,7 +351,10 @@ public final class PermissionsManagerClient implements PermissionsManager, Plugi
             if (modPermissions != null && modPermissions.getModName() != null)
             {
-                this.serverPermissions.put(modPermissions.getModName(), modPermissions);
+                synchronized (this.serverPermissions)
+                {
+                    this.serverPermissions.put(modPermissions.getModName(), modPermissions);
+                }
                 Permissible permissible = this.registeredClientMods.get(modPermissions.getModName());
                 if (permissible != null) permissible.onPermissionsChanged(this);