Fix rare region future NPE

itsMatoosh · May 17, 2022 · da53d7a · da53d7a
1 parent 2f94b51
commit da53d7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'me.matoosh'
-version '1.6.0'
+version '1.6.1'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 
@@ -29,7 +29,7 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
 
     // lombok
-    compileOnly 'org.projectlombok:lombok:1.18.22'
+    compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
 
     testCompileOnly 'org.projectlombok:lombok:1.18.22'
@@ -42,11 +42,11 @@ dependencies {
     implementation 'com.github.seeseemelk:MockBukkit:v1.16-SNAPSHOT'
 
     // mockito
-    testImplementation 'org.mockito:mockito-core:4.1.0'
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
+    testImplementation 'org.mockito:mockito-core:4.5.1'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
 
     // assertj
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
 }
 
 test {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/me/matoosh/blockmetadata/BlockMetadataStorage.java b/src/main/java/me/matoosh/blockmetadata/BlockMetadataStorage.java
@@ -271,16 +271,16 @@ public CompletableFuture<Region> getRegion(@NonNull ChunkInfo chunkInfo) {
         String regionKey = getRegionKey(chunkInfo);
         Region region = regions.get(regionKey);
         if (region == null) {
-            // buffer region
+            // create region object
             Path regionPath = getRegionFile(chunkInfo);
             Region newRegion = new Region(regionKey, chunkInfo.getWorld(), regionPath);
-            regions.put(newRegion.getKey(), newRegion);
 
             // load region
             ExecutorService regionExeService = Executors.newSingleThreadExecutor();
             CompletableFuture<Void> loadFuture = loadRegion(newRegion.getFilePath(), regionExeService)
                     .thenAccept(newRegion::setBuffer);
             newRegion.setLoadFuture(loadFuture);
+            regions.put(newRegion.getKey(), newRegion);
 
             // wait until region loads
             return newRegion.getLoadFuture().thenApply((d) -> newRegion);