Merge remote-tracking branch 'origin/1.21.11' into 1.21.11

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/prettybeaches/FloodingManager.java

@@ -2,38 +2,48 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import net.minecraft.server.level.ServerLevel;
+import java.util.WeakHashMap;
 
 public class FloodingManager {
 
     public static final int FLOOD_TIME = 10;
     private static final int MAX_DEPTH = 6;
 
-    private static final List<ScheduledFloodingEntry> scheduledFloods = new ArrayList<>();
+    private static final Map<ServerLevel, List<ScheduledFloodingEntry>> scheduledFloods = Collections.synchronizedMap(new WeakHashMap<>());
 
     public static void scheduleForFlooding(LevelAccessor level, BlockPos pos, int depth) {
         if (PrettyBeachesConfig.getActive().animatedFlooding) {
-            scheduledFloods.add(new ScheduledFloodingEntry(level, pos, depth));
+            if (level instanceof ServerLevel serverLevel) {
+                List<ScheduledFloodingEntry> floods = scheduledFloods.computeIfAbsent(serverLevel, k -> new ArrayList<>());
+                floods.add(new ScheduledFloodingEntry(pos, depth));
+            }
         } else {
             populateWater(level, pos, depth);
         }
     }
 
-    public static void onWorldTick(Level level) {
-        for (int i = scheduledFloods.size() - 1; i >= 0; i--) {
-            ScheduledFloodingEntry entry = scheduledFloods.get(i);
+    public static void onWorldTick(ServerLevel level) {
+        List<ScheduledFloodingEntry> floods = scheduledFloods.get(level);
+        if (floods == null || floods.isEmpty()) {
+            return;
+        }
+        for (int i = floods.size() - 1; i >= 0; i--) {
+            ScheduledFloodingEntry entry = floods.get(i);
             entry.ticksExisted++;
             if (entry.ticksExisted >= FLOOD_TIME) {
-                populateWater(entry.level, entry.pos, entry.depth);
-                scheduledFloods.remove(i);
+                populateWater(level, entry.pos, entry.depth);
+                floods.remove(i);
             }
         }
     }

common/src/main/java/net/blay09/mods/prettybeaches/ScheduledFloodingEntry.java

@@ -5,13 +5,11 @@
 import net.minecraft.world.level.LevelAccessor;
 
 public class ScheduledFloodingEntry {
-    public LevelAccessor level;
     public BlockPos pos;
     public int depth;
     public int ticksExisted;
 
-    public ScheduledFloodingEntry(LevelAccessor level, BlockPos pos, int depth) {
-        this.level = level;
+    public ScheduledFloodingEntry(BlockPos pos, int depth) {
         this.pos = pos;
         this.depth = depth;
     }