From bcbc4199790cc08b9c100cf33c15fd5aaa063120 Mon Sep 17 00:00:00 2001
From: Mgazul <mgazul@163.com>
Date: Fri, 26 Jan 2024 20:34:38 +0700
Subject: [PATCH] Fix worldBorder init

---
 .../minecraft/net/minecraft/world/World.java.patch    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch
index fab37e7e02..4a2c1884c8 100644
--- a/patches/minecraft/net/minecraft/world/World.java.patch
+++ b/patches/minecraft/net/minecraft/world/World.java.patch
@@ -137,11 +137,11 @@
 +      if (environment == null) {
 +         environment = ForgeInjectBukkit.environment.getOrDefault(p_i241925_3_, org.bukkit.World.Environment.CUSTOM);
 +      }
-+      func_175723_af().world = this; // Mohist move form ServerWorld
++
        this.field_72984_F = p_i241925_4_;
        this.field_72986_A = p_i241925_1_;
        this.field_234921_x_ = p_i241925_3_;
-@@ -102,11 +_,11 @@
+@@ -102,17 +_,18 @@
        if (p_i241925_3_.func_242724_f() != 1.0D) {
           this.field_175728_M = new WorldBorder() {
              public double func_230316_a_() {
@@ -155,6 +155,13 @@
              }
           };
        } else {
+          this.field_175728_M = new WorldBorder();
+       }
+ 
++      func_175723_af().world = this; // Mohist move form ServerWorld
+       this.field_217407_c = Thread.currentThread();
+       this.field_226689_w_ = new BiomeManager(this, p_i241925_7_, p_i241925_3_.func_227176_e_());
+       this.field_234916_c_ = p_i241925_6_;
 @@ -155,6 +_,11 @@
        return this.func_212866_a_(p_175726_1_.func_177958_n() >> 4, p_175726_1_.func_177952_p() >> 4);
     }