From 2d6de8ea7b65754f5fe18e674f7619925579202b Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sat, 6 Feb 2021 17:08:05 -0800
Subject: [PATCH] Fix Scheduled events being called by derived worlds. Closes
 #7631

---
 .../minecraft/world/server/ServerMultiWorld.java.patch    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/server/ServerMultiWorld.java.patch b/patches/minecraft/net/minecraft/world/server/ServerMultiWorld.java.patch
index 1976de8a61..d0165ea1e5 100644
--- a/patches/minecraft/net/minecraft/world/server/ServerMultiWorld.java.patch
+++ b/patches/minecraft/net/minecraft/world/server/ServerMultiWorld.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/server/ServerMultiWorld.java
 +++ b/net/minecraft/world/server/ServerMultiWorld.java
-@@ -10,11 +10,19 @@
+@@ -10,11 +10,22 @@
  import net.minecraft.world.storage.SaveHandler;
  
  public class ServerMultiWorld extends ServerWorld {
@@ -15,10 +15,12 @@
 +      p_i50708_1_.func_175723_af().func_177737_a(this.borderListener);
     }
  
--   protected void func_217389_a() {
+    protected void func_217389_a() {
+    }
++
 +   @Override
 +   public void close() throws java.io.IOException {
 +      super.close();
 +      this.delegate.func_175723_af().removeListener(this.borderListener); // Unlink ourselves, to prevent world leak.
-    }
++   }
  }