Merge pull request #3820 from mastermc05/v3.0

Try to fix rendering at shutdown

bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/AsyncChunkProvider118_2.java

@@ -93,6 +93,9 @@ public class AsyncChunkProvider118_2 {
         }
         //prepare data synchronously
         CompletableFuture<?> future = CompletableFuture.supplyAsync(() -> {
+            //Null will mean that we save with spigot methods, which may be risky on async
+            //Since we're not in main thread, it now refuses new tasks because of shutdown, the risk is lower
+            if (!Bukkit.isPrimaryThread()) return null;
             try {
                 return getAsyncSaveData.invoke(null, world.getHandle(), c);
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -103,15 +106,21 @@ public class AsyncChunkProvider118_2 {
         if (++currChunks > MapManager.mapman.getMaxChunkLoadsPerTick()) {
             try {
                 Thread.sleep(25); //hold the lock so other threads also won't stress main thread
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {}
-                throw new RuntimeException(e);
-            }
         }
         //save data asynchronously
         return () -> {
+            Object o = null;
             try {
-                return (NBTTagCompound) save.invoke(null, world.getHandle(), c, future.get());
+                o = future.get();
-            } catch (ReflectiveOperationException | ExecutionException | InterruptedException e) {
+                return (NBTTagCompound) save.invoke(null, world.getHandle(), c, o);
+            } catch (InterruptedException e) {
+                return null;
+            } catch (InvocationTargetException e) {
+                //We tried to use simple spigot methods at shutdown and failed, hopes for reading from disk
+                if (o == null) return null;
+                throw new RuntimeException(e);
+            } catch (ReflectiveOperationException | ExecutionException e) {
                 throw new RuntimeException(e);
             }
         };

bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/MapChunkCache118_2.java

@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
 /**
@@ -61,7 +61,14 @@ public class MapChunkCache118_2 extends GenericMapChunkCache {
         try {
             CompletableFuture<NBTTagCompound> nbt = provider.getChunk(((CraftWorld) w).getHandle(), chunk.x, chunk.z);
             return () -> {
-                NBTTagCompound compound = nbt.join();
+                NBTTagCompound compound;
+                try {
+                    compound = nbt.get();
+                } catch (InterruptedException e) {
+                    return null;
+                } catch (ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
                 return compound == null ? null : parseChunkFromNBT(new NBT.NBTCompound(compound));
             };
         } catch (InvocationTargetException | IllegalAccessException ignored) {

bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/AsyncChunkProvider119.java

@@ -92,6 +92,9 @@ public class AsyncChunkProvider119 {
         }
         //prepare data synchronously
         CompletableFuture<?> future = CompletableFuture.supplyAsync(() -> {
+            //Null will mean that we save with spigot methods, which may be risky on async
+            //Since we're not in main thread, it now refuses new tasks because of shutdown, the risk is lower
+            if (!Bukkit.isPrimaryThread()) return null;
             try {
                 return getAsyncSaveData.invoke(null, world.getHandle(), c);
             } catch (ReflectiveOperationException e) {
@@ -102,15 +105,21 @@ public class AsyncChunkProvider119 {
         if (++currChunks > MapManager.mapman.getMaxChunkLoadsPerTick()) {
             try {
                 Thread.sleep(25); //hold the lock so other threads also won't stress main thread
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {}
-                throw new RuntimeException(e);
-            }
         }
         //save data asynchronously
         return () -> {
+            Object o = null;
             try {
-                return (NBTTagCompound) save.invoke(null, world.getHandle(), c, future.get());
+                o = future.get();
-            } catch (ReflectiveOperationException | ExecutionException | InterruptedException e) {
+                return (NBTTagCompound) save.invoke(null, world.getHandle(), c, o);
+            } catch (InterruptedException e) {
+                return null;
+            } catch (InvocationTargetException e) {
+                //We tried to use simple spigot methods at shutdown and failed, hopes for reading from disk
+                if (o == null) return null;
+                throw new RuntimeException(e);
+            } catch (ReflectiveOperationException | ExecutionException e) {
                 throw new RuntimeException(e);
             }
         };

bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/MapChunkCache119.java

@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
 /**
@@ -58,7 +59,14 @@ public class MapChunkCache119 extends GenericMapChunkCache {
         try {
             CompletableFuture<NBTTagCompound> nbt = provider.getChunk(((CraftWorld) w).getHandle(), chunk.x, chunk.z);
             return () -> {
-                NBTTagCompound compound = nbt.join();
+                NBTTagCompound compound;
+                try {
+                    compound = nbt.get();
+                } catch (InterruptedException e) {
+                    return null;
+                } catch (ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
                 return compound == null ? null : parseChunkFromNBT(new NBT.NBTCompound(compound));
             };
         } catch (InvocationTargetException | IllegalAccessException ignored) {