From 31f48cc7d14a159b39d38f02348885a6410ae490 Mon Sep 17 00:00:00 2001
From: Jordan <dordsor21@gmail.com>
Date: Wed, 5 Jan 2022 21:22:09 +0100
Subject: [PATCH] Fix: 1.18 uses the same field as 1.17 for mustNotSave (#3428)

---
 .../bukkit/listener/ChunkListener.java        | 61 +------------------
 1 file changed, 3 insertions(+), 58 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
index d9b387e5d..95e35a076 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
@@ -108,41 +108,11 @@ public class ChunkListener implements Listener {
                         this.isTrueForNotSave = false;
                     } else {
                         this.mustSave = classChunk.getField("mustNotSave");
-                        /*
-                        this.worldServer = classCraftWorld.getField("world");
-                        this.methodGetChunkProvider = getRefClass("{nms}.WorldServer").getMethod("getChunkProvider");
-                        this.playerChunkMap = getRefClass("{nms}.ChunkProviderServer").getField("playerChunkMap");
-                        RefClass classPlayerChunkMap = getRefClass("{nms}.PlayerChunkMap");
-                        if (PaperLib.isPaper() && version == 16) {
-                            this.updatingChunks = classPlayerChunkMap.getField("updatingChunks");
-                            this.methodGetVisibleMap = getRefClass("com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object").getMethod(
-                                    "getVisibleMap");
-                        } else {
-                            this.visibleChunks = classPlayerChunkMap.getField("visibleChunks");
-                        }
-                        this.methodGetFullChunk = getRefClass("{nms}.PlayerChunk").getMethod("getFullChunk");
-                        this.methodGetBukkitChunk = getRefClass("{nms}.Chunk").getMethod("getBukkitChunk");
-                        */
                     }
-                } else if (version == 17) {
+                } else {
                     RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
                     this.mustSave = classChunk.getField("mustNotSave");
-                    /*
-                    this.worldServer = classCraftWorld.getField("world");
-                    this.methodGetChunkProvider = getRefClass("net.minecraft.server.level.WorldServer").getMethod(
-                            "getChunkProvider");
-                    this.playerChunkMap = getRefClass("net.minecraft.server.level.ChunkProviderServer").getField("a");
-                    RefClass classPlayerChunkMap = getRefClass("net.minecraft.server.level.PlayerChunkMap");
-                    if (PaperLib.isPaper()) {
-                        this.updatingChunks = classPlayerChunkMap.getField("updatingChunks");
-                        this.methodGetVisibleMap = getRefClass("com.destroystokyo.paper.util.map.QueuedChangesMapLong2Object").getMethod(
-                                "getVisibleMap");
-                    } else {
-                        this.visibleChunks = classPlayerChunkMap.getField("l");
-                    }
-                    this.methodGetFullChunk = getRefClass("net.minecraft.server.level.PlayerChunk").getMethod("getFullChunk");
-                    this.methodGetBukkitChunk = getRefClass("net.minecraft.world.level.chunk.Chunk").getMethod("getBukkitChunk");
-                     */
+
                 }
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
@@ -182,32 +152,7 @@ public class ChunkListener implements Listener {
                             }
                             toUnload.add(chunk);
                         }
-                    }/* else {
-                        Object worldServer = this.worldServer.of(craftWorld).get();
-                        Object chunkProviderServer = methodGetChunkProvider.of(worldServer).call();
-                        Object playerChunkMap = this.playerChunkMap.of(chunkProviderServer).get();
-                        Long2ObjectLinkedOpenHashMap<?> chunks;
-                        if (PaperLib.isPaper() && version > 15) {
-                            Object updatingChunks = this.updatingChunks.of(playerChunkMap).get();
-                            chunks = (Long2ObjectLinkedOpenHashMap<?>) this.methodGetVisibleMap.of(updatingChunks).call();
-                        } else {
-                            chunks = (Long2ObjectLinkedOpenHashMap<?>) this.visibleChunks.of(playerChunkMap).get();
-                        }
-                        for (Object playerChunk : chunks.values()) {
-                            Object nmsChunk = this.methodGetFullChunk.of(playerChunk).call();
-                            if (nmsChunk == null) {
-                                continue;
-                            }
-                            Chunk chunk = (Chunk) this.methodGetBukkitChunk.of(nmsChunk).call();
-                            int x = chunk.getX();
-                            int z = chunk.getZ();
-                            if (!shouldSave(worldName, x, z)) {
-                                unloadChunk(worldName, chunk, false);
-                                continue;
-                            }
-                            toUnload.add(chunk);
-                        }
-                    }*/
+                    }
                 }
                 if (toUnload.isEmpty()) {
                     return;