Update fluid chunk loading patch

1 files changed, 0 insertions, 72 deletions

diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0558-Add-worldborder-events.patch
deleted file mode 100644
index 176d1259e4..0000000000
--- a/patches/server/0558-Add-worldborder-events.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Mon, 4 Jan 2021 22:40:34 -0800
-Subject: [PATCH] Add worldborder events
-
-
-diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-index dd74e8a034022fe72a1652f92712182b4910f651..204f008dc36212e696fba781fede88044b2f735a 100644
---- a/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-+++ b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
-@@ -123,6 +123,14 @@ public class WorldBorder {
-     }
- 
-     public void setCenter(double x, double z) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderCenterChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), new org.bukkit.Location(world.getWorld(), this.getCenterX(), 0, this.getCenterZ()), new org.bukkit.Location(world.getWorld(), x, 0, z));
-+            if (!event.callEvent()) return;
-+            x = event.getNewCenter().getX();
-+            z = event.getNewCenter().getZ();
-+        }
-+        // Paper end
-         this.centerX = x;
-         this.centerZ = z;
-         this.extent.onCenterChange();
-@@ -149,6 +157,17 @@ public class WorldBorder {
-     }
- 
-     public void setSize(double size) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE, getSize(), size, 0);
-+            if (!event.callEvent()) return;
-+            if (event.getType() == io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE && event.getDuration() > 0) { // If changed to a timed transition
-+                lerpSizeBetween(event.getOldSize(), event.getNewSize(), event.getDuration());
-+                return;
-+            }
-+            size = event.getNewSize();
-+        }
-+        // Paper end
-         this.extent = new WorldBorder.StaticBorderExtent(size);
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -161,6 +180,20 @@ public class WorldBorder {
-     }
- 
-     public void lerpSizeBetween(double fromSize, double toSize, long time) {
-+        // Paper start
-+        if (this.world != null) {
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type type;
-+            if (fromSize == toSize) { // new size = old size
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.INSTANT_MOVE; // Use INSTANT_MOVE because below it creates a Static border if they are equal.
-+            } else {
-+                type = io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent.Type.STARTED_MOVE;
-+            }
-+            io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent event = new io.papermc.paper.event.world.border.WorldBorderBoundsChangeEvent(world.getWorld(), world.getWorld().getWorldBorder(), type, fromSize, toSize, time);
-+            if (!event.callEvent()) return;
-+            toSize = event.getNewSize();
-+            time = event.getDuration();
-+        }
-+        // Paper end
-         this.extent = (WorldBorder.BorderExtent) (fromSize == toSize ? new WorldBorder.StaticBorderExtent(toSize) : new WorldBorder.MovingBorderExtent(fromSize, toSize, time));
-         Iterator iterator = this.getListeners().iterator();
- 
-@@ -472,6 +505,7 @@ public class WorldBorder {
- 
-         @Override
-         public WorldBorder.BorderExtent update() {
-+            if (world != null && this.getLerpRemainingTime() <= 0L) new io.papermc.paper.event.world.border.WorldBorderBoundsChangeFinishEvent(world.getWorld(), world.getWorld().getWorldBorder(), this.from, this.to, this.lerpDuration).callEvent(); // Paper
-             return (WorldBorder.BorderExtent) (this.getLerpRemainingTime() <= 0L ? WorldBorder.this.new StaticBorderExtent(this.to) : this);
-         }
-