From 5af7b3afbb8720e90ae5afee41b25785ee2f4c05 Mon Sep 17 00:00:00 2001
From: Noah van der Aa <ndvdaa@gmail.com>
Date: Thu, 31 Oct 2024 22:30:18 +0100
Subject: [PATCH] Correctly clear  explosion density cache(#11541)

---
 patches/server/Optimize-explosions.patch                  | 8 ++++----
 ...row-exception-on-world-create-while-being-ticked.patch | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/server/Optimize-explosions.patch b/patches/server/Optimize-explosions.patch
index 38d5f8aac2..5dc126dc06 100644
--- a/patches/server/Optimize-explosions.patch
+++ b/patches/server/Optimize-explosions.patch
@@ -14,13 +14,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         if (System.console() == null && System.getProperty("jline.terminal") == null) {
-             System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
-             Main.useJline = false;
+ 
+             gameprofilerfiller.pop();
+             gameprofilerfiller.pop();
 +            worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
  
-         try {
+         gameprofilerfiller.popPush("connection");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
diff --git a/patches/server/Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
index ef501f0bda..90077e86c7 100644
--- a/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/Throw-exception-on-world-create-while-being-ticked.patch
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              gameprofilerfiller.pop();
-             gameprofilerfiller.pop();
+             worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
 +        this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked