Possible fix for #58 Inconsistent chunk after /city delete

GameModsBR · Nov 14, 2016 · a2d3174 · a2d3174
1 parent 692c1b3
commit a2d3174
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/Forge/Base/src/main/java/br/com/gamemods/minecity/forge/base/MineCityForge.java b/Forge/Base/src/main/java/br/com/gamemods/minecity/forge/base/MineCityForge.java
@@ -594,6 +594,14 @@ public ClaimedChunk getClaim(@NotNull ChunkPos pos)
         return chunk.getMineCityClaim();
     }
 
+    private void setClaim(@NotNull IChunk chunk, @NotNull ClaimedChunk claim)
+    {
+        ClaimedChunk old = chunk.getMineCityClaim();
+        chunk.setMineCityClaim(claim);
+        if(old != null && old != claim)
+            old.invalidate();
+    }
+
     public boolean setClaim(@NotNull ClaimedChunk claim)
     {
         ChunkPos pos = claim.chunk;
@@ -602,10 +610,7 @@ public boolean setClaim(@NotNull ClaimedChunk claim)
             IChunk chunk = (IChunk) pos.instance;
             if(chunk.isMineCityChunkValid())
             {
-                ClaimedChunk old = chunk.getMineCityClaim();
-                chunk.setMineCityClaim(claim);
-                if(old != null && old != claim)
-                    old.invalidate();
+                setClaim(chunk, claim);
                 return true;
             }
         }
@@ -619,7 +624,7 @@ public boolean setClaim(@NotNull ClaimedChunk claim)
             return false;
 
         pos.instance = forgeChunk;
-        forgeChunk.setMineCityClaim(claim);
+        setClaim(forgeChunk, claim);
         return true;
     }