Synchronize on the class instead of the instance

I didn't realize it before, but it looks like there is at least one instance of YamlRegionFile per world, so synchronizing on the instance wouldn't necessarily help.
EngineHub · Jul 19, 2023 · 5763f53 · 5763f53
1 parent 7ba0fd3
commit 5763f53
Showing 1 changed file with 54 additions and 52 deletions.
diff --git a/...e/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java b/...e/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java
@@ -192,66 +192,68 @@ public Set<ProtectedRegion> loadAll(FlagRegistry flagRegistry) throws StorageExc
     }
 
     @Override
-    public synchronized void saveAll(Set<ProtectedRegion> regions) throws StorageException {
+    public void saveAll(Set<ProtectedRegion> regions) throws StorageException {
         checkNotNull(regions);
 
-        File tempFile = new File(file.getParentFile(), file.getName() + ".tmp");
-        YAMLProcessor config = createYamlProcessor(tempFile);
-
-        config.clear();
-
-        YAMLNode regionsNode = config.addNode("regions");
-        Map<String, Object> map = regionsNode.getMap();
-
-        for (ProtectedRegion region : regions) {
-            Map<String, Object> nodeMap = new HashMap<>();
-            map.put(region.getId(), nodeMap);
-            YAMLNode node = new YAMLNode(nodeMap, false);
-
-            if (region instanceof ProtectedCuboidRegion) {
-                ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
-                node.setProperty("type", "cuboid");
-                node.setProperty("min", cuboid.getMinimumPoint());
-                node.setProperty("max", cuboid.getMaximumPoint());
-            } else if (region instanceof ProtectedPolygonalRegion) {
-                ProtectedPolygonalRegion poly = (ProtectedPolygonalRegion) region;
-                node.setProperty("type", "poly2d");
-                node.setProperty("min-y", poly.getMinimumPoint().getBlockY());
-                node.setProperty("max-y", poly.getMaximumPoint().getBlockY());
-
-                List<Map<String, Object>> points = new ArrayList<>();
-                for (BlockVector2 point : poly.getPoints()) {
-                    Map<String, Object> data = new HashMap<>();
-                    data.put("x", point.getBlockX());
-                    data.put("z", point.getBlockZ());
-                    points.add(data);
+        synchronized (YamlRegionFile.class) {
+            File tempFile = new File(file.getParentFile(), file.getName() + ".tmp");
+            YAMLProcessor config = createYamlProcessor(tempFile);
+
+            config.clear();
+
+            YAMLNode regionsNode = config.addNode("regions");
+            Map<String, Object> map = regionsNode.getMap();
+
+            for (ProtectedRegion region : regions) {
+                Map<String, Object> nodeMap = new HashMap<>();
+                map.put(region.getId(), nodeMap);
+                YAMLNode node = new YAMLNode(nodeMap, false);
+
+                if (region instanceof ProtectedCuboidRegion) {
+                    ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
+                    node.setProperty("type", "cuboid");
+                    node.setProperty("min", cuboid.getMinimumPoint());
+                    node.setProperty("max", cuboid.getMaximumPoint());
+                } else if (region instanceof ProtectedPolygonalRegion) {
+                    ProtectedPolygonalRegion poly = (ProtectedPolygonalRegion) region;
+                    node.setProperty("type", "poly2d");
+                    node.setProperty("min-y", poly.getMinimumPoint().getBlockY());
+                    node.setProperty("max-y", poly.getMaximumPoint().getBlockY());
+
+                    List<Map<String, Object>> points = new ArrayList<>();
+                    for (BlockVector2 point : poly.getPoints()) {
+                        Map<String, Object> data = new HashMap<>();
+                        data.put("x", point.getBlockX());
+                        data.put("z", point.getBlockZ());
+                        points.add(data);
+                    }
+
+                    node.setProperty("points", points);
+                } else if (region instanceof GlobalProtectedRegion) {
+                    node.setProperty("type", "global");
+                } else {
+                    node.setProperty("type", region.getClass().getCanonicalName());
                 }
 
-                node.setProperty("points", points);
-            } else if (region instanceof GlobalProtectedRegion) {
-                node.setProperty("type", "global");
-            } else {
-                node.setProperty("type", region.getClass().getCanonicalName());
-            }
-
-            node.setProperty("priority", region.getPriority());
-            node.setProperty("flags", getFlagData(region));
-            node.setProperty("owners", getDomainData(region.getOwners()));
-            node.setProperty("members", getDomainData(region.getMembers()));
+                node.setProperty("priority", region.getPriority());
+                node.setProperty("flags", getFlagData(region));
+                node.setProperty("owners", getDomainData(region.getOwners()));
+                node.setProperty("members", getDomainData(region.getMembers()));
 
-            ProtectedRegion parent = region.getParent();
-            if (parent != null) {
-                node.setProperty("parent", parent.getId());
+                ProtectedRegion parent = region.getParent();
+                if (parent != null) {
+                    node.setProperty("parent", parent.getId());
+                }
             }
-        }
 
-        config.setHeader(FILE_HEADER);
-        config.save();
+            config.setHeader(FILE_HEADER);
+            config.save();
 
-        //noinspection ResultOfMethodCallIgnored
-        file.delete();
-        if (!tempFile.renameTo(file)) {
-            throw new StorageException("Failed to rename temporary regions file to " + file.getAbsolutePath());
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+            if (!tempFile.renameTo(file)) {
+                throw new StorageException("Failed to rename temporary regions file to " + file.getAbsolutePath());
+            }
         }
     }