Delete old world folder properly

Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>

Author: calcastor

core/src/main/java/tc/oc/pgm/PGMPlugin.java

@@ -1,5 +1,7 @@
 package tc.oc.pgm;
 
+import static tc.oc.pgm.util.bukkit.MiscUtils.MISC_UTILS;
+
 import com.google.common.collect.Lists;
 import fr.minuskube.inv.InventoryManager;
 import java.io.File;
@@ -67,7 +69,6 @@
 import tc.oc.pgm.rotation.MapPoolManager;
 import tc.oc.pgm.rotation.RandomMapOrder;
 import tc.oc.pgm.tablist.MatchTabManager;
-import tc.oc.pgm.util.FileUtils;
 import tc.oc.pgm.util.bukkit.ViaUtils;
 import tc.oc.pgm.util.chunk.NullChunkGenerator;
 import tc.oc.pgm.util.concurrent.BukkitExecutorService;
@@ -211,14 +212,7 @@ public void onEnable() {
         config.getGroups().isEmpty() ? null : new ConfigDecorationProvider());
 
     // Sometimes match folders need to be cleaned up if the server previously crashed
-    final File[] worldDirs = getServer().getWorldContainer().listFiles();
-    if (worldDirs != null) {
-      for (File dir : worldDirs) {
-        if (dir.isDirectory() && dir.getName().startsWith("match")) {
-          FileUtils.delete(dir);
-        }
-      }
-    }
+    MISC_UTILS.cleanupWorldFiles();
 
     matchManager = new MatchManagerImpl(logger);
 

core/src/main/java/tc/oc/pgm/match/MatchImpl.java

@@ -2,6 +2,7 @@
 
 import static tc.oc.pgm.util.Assert.assertNotNull;
 import static tc.oc.pgm.util.Assert.assertTrue;
+import static tc.oc.pgm.util.bukkit.MiscUtils.MISC_UTILS;
 import static tc.oc.pgm.util.nms.NMSHacks.NMS_HACKS;
 
 import com.google.common.collect.ImmutableList;
@@ -946,8 +947,8 @@ public void destroy() {
           Level.SEVERE, "Unable to unload world " + worldName + " (this can cause memory leaks!)");
     }
 
-    final File oldMatchFolder = new File(PGM.get().getServer().getWorldContainer(), worldName);
-    if (oldMatchFolder.exists()) {
+    final File oldMatchFolder = MISC_UTILS.getWorldFolder(worldName);
+    if (oldMatchFolder != null && oldMatchFolder.exists()) {
       FileUtils.delete(oldMatchFolder);
     }
   }

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/impl/ModernMiscUtil.java

@@ -2,18 +2,23 @@
 
 import static tc.oc.pgm.util.platform.Supports.Variant.PAPER;
 
+import io.papermc.paper.world.PaperWorldLoader;
+import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ExplosionResult;
 import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.damage.DamageSource;
 import org.bukkit.damage.DamageType;
 import org.bukkit.enchantments.Enchantment;
@@ -36,6 +41,7 @@
 import org.bukkit.scoreboard.Team;
 import tc.oc.pgm.platform.modern.material.ModernBlockMaterialData;
 import tc.oc.pgm.util.DataVersions;
+import tc.oc.pgm.util.FileUtils;
 import tc.oc.pgm.util.bukkit.MiscUtils;
 import tc.oc.pgm.util.material.BlockMaterialData;
 import tc.oc.pgm.util.platform.Supports;
@@ -133,4 +139,27 @@ public Entity getFakePickupEntity(PlayerPickupItemEvent ev) {
     if (ev instanceof PlayerPickupArrowEvent arrowEvent) return arrowEvent.getArrow();
     return ev.getItem();
   }
+
+  @Override
+  public File getWorldFolder(String worldName) {
+    var console = ((CraftServer) Bukkit.getServer()).getServer();
+    var dimensionKey = PaperWorldLoader.dimensionKey(NamespacedKey.minecraft(worldName));
+    return console.storageSource.getDimensionPath(dimensionKey).toFile();
+  }
+
+  @Override
+  public void cleanupWorldFiles() {
+    MiscUtils.super.cleanupWorldFiles();
+
+    // Probe a non-existent dimension to get the dimension folder
+    final File dimsFolder = new File(getWorldFolder("probe").getParent());
+    final File[] dimDirs = dimsFolder.listFiles();
+    if (dimDirs != null) {
+      for (File dir : dimDirs) {
+        if (dir.isDirectory() && dir.getName().startsWith("match")) {
+          FileUtils.delete(dir);
+        }
+      }
+    }
+  }
 }

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/impl/ModernNMSHacks.java

@@ -337,16 +337,6 @@ public boolean canMineBlock(BlockMaterialData blockMaterial, Player player) {
         .isPreferredTool(player.getInventory().getItemInMainHand());
   }
 
-  @Override
-  public void resetDimension(World world) {
-    // no-op
-  }
-
-  @Override
-  public void cleanupWorld(World world) {
-    // no-op
-  }
-
   @Override
   public void cleanupPlayer(Player player) {
     player.setKiller(null);

platform/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/impl/SpMiscUtil.java

@@ -4,12 +4,14 @@
 import static tc.oc.pgm.util.platform.Supports.Priority.HIGH;
 import static tc.oc.pgm.util.platform.Supports.Variant.SPORTPAPER;
 
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import net.kyori.adventure.key.Key;
 import net.minecraft.server.v1_8_R3.EntityPotion;
 import net.minecraft.server.v1_8_R3.NBTCompressedStreamTools;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -123,4 +125,9 @@ public boolean isDestructiveExplosion(EntityExplodeEvent ev) {
   public Entity getFakePickupEntity(PlayerPickupItemEvent ev) {
     return ev.getItem();
   }
+
+  @Override
+  public File getWorldFolder(String worldName) {
+    return new File(Bukkit.getServer().getWorldContainer(), worldName);
+  }
 }

util/src/main/java/tc/oc/pgm/util/bukkit/MiscUtils.java

@@ -1,9 +1,11 @@
 package tc.oc.pgm.util.bukkit;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Arrow;
@@ -21,6 +23,7 @@
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.Team;
+import tc.oc.pgm.util.FileUtils;
 import tc.oc.pgm.util.material.BlockMaterialData;
 import tc.oc.pgm.util.platform.Platform;
 
@@ -60,4 +63,17 @@ default void initScoreboardTeam(Team team, NamedTextColor color) {}
   boolean isDestructiveExplosion(EntityExplodeEvent ev);
 
   Entity getFakePickupEntity(PlayerPickupItemEvent ev);
+
+  File getWorldFolder(String worldName);
+
+  default void cleanupWorldFiles() {
+    final File[] worldDirs = Bukkit.getServer().getWorldContainer().listFiles();
+    if (worldDirs != null) {
+      for (File dir : worldDirs) {
+        if (dir.isDirectory() && dir.getName().startsWith("match")) {
+          FileUtils.delete(dir);
+        }
+      }
+    }
+  }
 }

util/src/main/java/tc/oc/pgm/util/nms/NMSHacks.java

@@ -44,9 +44,13 @@ public interface NMSHacks {
 
   boolean canMineBlock(BlockMaterialData blockMaterial, Player player);
 
-  void resetDimension(World world);
+  default void resetDimension(World world) {
+    // no-op
+  }
 
-  void cleanupWorld(World world);
+  default void cleanupWorld(World world) {
+    // no-op
+  }
 
   void cleanupPlayer(Player player);