Copy over fields for dynamic maps

BattlePlugins · Jul 3, 2024 · 3def938 · 3def938
1 parent 0a983b8
commit 3def938
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/plugin/src/main/java/org/battleplugins/arena/competition/map/LiveCompetitionMap.java b/plugin/src/main/java/org/battleplugins/arena/competition/map/LiveCompetitionMap.java
@@ -12,6 +12,7 @@
 import org.battleplugins.arena.config.ParseException;
 import org.battleplugins.arena.config.PostProcessable;
 import org.battleplugins.arena.util.BlockUtil;
+import org.battleplugins.arena.util.FieldUtil;
 import org.battleplugins.arena.util.VoidChunkGenerator;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -68,6 +69,10 @@ public LiveCompetitionMap(String name, Arena arena, MapType type, String world,
 
     @Override
     public void postProcess() {
+        if (this.mapWorld != null) {
+            return; // Map was already set in createDynamicCompetition
+        }
+
         this.mapWorld = Bukkit.getWorld(this.world);
         if (this.mapWorld == null) {
             throw new IllegalStateException("World " + this.world + " for map " + this.name + " in arena " + this.arena.getName() + " does not exist!");
@@ -242,7 +247,13 @@ public final Competition<?> createDynamicCompetition(Arena arena) {
         }
 
         LiveCompetitionMap copy = arena.getMapFactory().create(this.name, arena, this.type, worldName, this.bounds, this.spawns);
+        // Copy additional fields for custom maps
+        if (copy.getClass() != LiveCompetitionMap.class) {
+            FieldUtil.copyFields(this, copy);
+        }
+
         copy.mapWorld = world;
+        copy.postProcess();
 
         return copy.createCompetition(arena);
     }

diff --git a/plugin/src/main/java/org/battleplugins/arena/util/FieldUtil.java b/plugin/src/main/java/org/battleplugins/arena/util/FieldUtil.java
@@ -0,0 +1,24 @@
+package org.battleplugins.arena.util;
+
+import org.battleplugins.arena.config.ArenaOption;
+
+import java.lang.reflect.Field;
+
+public class FieldUtil {
+
+    public static <T> void copyFields(T oldInstance, T newInstance) {
+        for (Field field : oldInstance.getClass().getDeclaredFields()) {
+            if (!field.isAnnotationPresent(ArenaOption.class)) {
+                continue;
+            }
+
+            field.setAccessible(true);
+
+            try {
+                field.set(newInstance, field.get(oldInstance));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException("Failed to copy field " + field.getName(), e);
+            }
+        }
+    }
+}