From 298bcc82ccec8692a2746b52cefc429b825cdb8c Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Fri, 23 Oct 2020 14:28:23 +0800
Subject: [PATCH] Fix world map not updating after creating new world (#64)

---
 .../io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java | 1 +
 .../arclight/common/mixin/core/server/MinecraftServerMixin.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java
index 1a69ccec..8b7fd4f1 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java
@@ -133,6 +133,7 @@ public abstract class CraftServerMixin implements CraftServerBridge {
     @Inject(method = "unloadWorld(Lorg/bukkit/World;Z)Z", require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerWorld;getChunkProvider()Lnet/minecraft/world/server/ServerChunkProvider;"))
     private void arclight$unloadForge(World world, boolean save, CallbackInfoReturnable<Boolean> cir) {
         MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(((CraftWorld) world).getHandle()));
+        this.console.markWorldsDirty();
     }
 
     @Override
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
index 1f60c58c..92e23993 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
@@ -119,6 +119,7 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
     @Shadow protected abstract void func_240778_a_(IServerConfiguration p_240778_1_);
     @Shadow protected IServerConfiguration field_240768_i_;
     @Shadow private static void func_240786_a_(ServerWorld p_240786_0_, IServerWorldInfo p_240786_1_, boolean hasBonusChest, boolean p_240786_3_, boolean p_240786_4_) { }
+    @Shadow @Deprecated public abstract void markWorldsDirty();
     // @formatter:on
 
     public MinecraftServerMixin(String name) {
@@ -404,6 +405,7 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
 
     // bukkit methods
     public void loadSpawn(IChunkStatusListener listener, ServerWorld serverWorld) {
+        this.markWorldsDirty();
         MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(serverWorld));
         if (!((WorldBridge) serverWorld).bridge$getWorld().getKeepSpawnInMemory()) {
             return;