Too many nullchecks, idot

.gitignore

@@ -16,5 +16,3 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
-/commit.sh
-/publish.sh

build.gradle.kts

@@ -3,8 +3,8 @@ import io.papermc.paperweight.util.constants.*
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.8"
+    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+    id("io.papermc.paperweight.patcher") version "1.3.6"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"
@@ -17,9 +17,9 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
-    paperclip("io.papermc:paperclip:3.0.3")
+    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
+    decompiler("net.minecraftforge:forgeflower:1.5.605.7")
+    paperclip("io.papermc:paperclip:3.0.2")
 }
 
 allprojects {
@@ -83,6 +83,21 @@ tasks.generateDevelopmentBundle {
     )
 }
 
+allprojects {
+    // Publishing API:
+    // ./gradlew :Slice-API:publish[ToMavenLocal]
+    publishing {
+        repositories {
+            maven {
+                name = "jitpack"
+                url = uri("https://jitpack.io")
+                // https://docs.gradle.org/current/samples/sample_publishing_credentials.html
+                credentials(PasswordCredentials::class)
+            }
+        }
+    }
+}
+
 publishing {
     // Publishing dev bundle:
     // ./gradlew publishDevBundlePublicationTo(MavenLocal|MyRepoSnapshotsRepository) -PpublishDevBundle

gradle.properties

@@ -1,8 +1,8 @@
 group=com.lokamc.slice
-version=1.20.1-R0.1-SNAPSHOT
+version=1.18.2-R0.1-SNAPSHOT
 
-mcVersion=1.20.1
-paperRef=29d1c7b60244bb002d29a5dcfc9c995019f550ab
+mcVersion=1.18.2
+paperRef=b1ac25fdb8e2c011cc0b006d0b478e11879a29d8
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

patches/api/0001-Add-PlayerShieldDisableEvent.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Fri, 12 Aug 2022 08:16:16 -0500
+Date: Sun, 27 Feb 2022 09:47:57 -0600
 Subject: [PATCH] Add PlayerShieldDisableEvent
 
 

patches/api/0002-Set-BlockData-without-light-update.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:29:11 -0500
-Subject: [PATCH] Set BlockData without light updates
+From: Tom <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 08:40:41 -0600
+Subject: [PATCH] Set BlockData without light update
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 390a2a2611df35a9ea6f1eb996b47e2aa4597ff0..384e5700b6899850d91a34e1d13d1ca0678cfaaa 100644
+index 3e980c630452c8ea72227bc4cd92c605253cd41b..fe23d144175b3bd55564a4a266b98cd2fc70a08a 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -298,6 +298,28 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
+@@ -297,6 +297,28 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
       */
      void setBlockData(@NotNull BlockData data, boolean applyPhysics);
  

patches/api/0003-Add-BlockDestroyedByNeighborEvent.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:30:30 -0500
+Date: Mon, 28 Feb 2022 08:54:52 -0600
 Subject: [PATCH] Add BlockDestroyedByNeighborEvent
 
 

patches/api/0004-Add-Player-to-SpongeAbsorbEvent.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:36:22 -0500
+Date: Mon, 28 Feb 2022 08:55:29 -0600
 Subject: [PATCH] Add Player to SpongeAbsorbEvent
 
 

patches/api/0005-Add-provided-Material-to-getDrops.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:31:55 -0500
+Date: Mon, 28 Feb 2022 08:56:16 -0600
 Subject: [PATCH] Add provided Material to getDrops
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 384e5700b6899850d91a34e1d13d1ca0678cfaaa..9c1aef68b1b6f4fddfa171f7189dda5619e758d6 100644
+index 3fc35a559ea53f045f2f72b272bc8ba34d1b2994..7fbd9c223bf34feb35f7836b42a3bd220c4cbbc5 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -666,6 +666,20 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
+@@ -624,6 +624,20 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
      @NotNull
      Collection<ItemStack> getDrops(@NotNull ItemStack tool, @Nullable Entity entity);
  

patches/api/0006-World-Instance-flag.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:37:06 -0500
-Subject: [PATCH] Add World Instance flag
+Date: Mon, 28 Feb 2022 09:17:28 -0600
+Subject: [PATCH] World Instance flag
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6917931966377c51db88a3364997a110dd987970..792b1b4ea3330b282961844d48b2dc56e0201c7e 100644
+index d4c60cf8404641fa8580cb0653e6f7a10baed865..fde06c5d88ffb63910bcb06e3e70e3c0a4af92c7 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2573,6 +2573,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2602,6 +2602,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       */
      public void setAutoSave(boolean value);
  

patches/api/0007-Add-PlayerTrackEntityEvent.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 09:33:54 -0600
+Subject: [PATCH] Add PlayerTrackEntityEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0532a7986a8091e82f1fc64b9654be26d6c8ea5e
+--- /dev/null
++++ b/src/main/java/org/bukkit/event/player/PlayerTrackEntityEvent.java
+@@ -0,0 +1,40 @@
++package org.bukkit.event.player;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.Player;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a player tracks an entity.
++ */
++public class PlayerTrackEntityEvent extends PlayerEvent {
++    private static final HandlerList handlers = new HandlerList();
++    private final Entity tracked;
++
++    public PlayerTrackEntityEvent(@NotNull final Player player, @NotNull final Entity tracked) {
++        super(player);
++        this.tracked = tracked;
++    }
++
++    /**
++     * Gets the entity newly tracked by the Player
++     *
++     * @return Entity the player is now tracking
++     */
++    @NotNull
++    public Entity getTracked() {
++        return tracked;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}

patches/api/0008-Add-player-data-saving-events.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tom <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:38:40 -0500
-Subject: [PATCH] Add PlayerData Events
+Date: Mon, 28 Feb 2022 09:36:31 -0600
+Subject: [PATCH] Add player data saving events
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLoadDataEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLoadDataEvent.java

patches/api/0009-Add-PlayerGetRespawnLocationEvent.patch

@@ -1,18 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:46:19 -0500
+Date: Sun, 3 Apr 2022 08:28:24 -0500
 Subject: [PATCH] Add PlayerGetRespawnLocationEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerGetRespawnLocationEvent.java b/src/main/java/org/bukkit/event/player/PlayerGetRespawnLocationEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7eca4d6929fc7a75974d182c1ea692d3823a19c0
+index 0000000000000000000000000000000000000000..dd7ecdb59e1a7e89ea63767a688337bb22f9cf59
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerGetRespawnLocationEvent.java
 @@ -0,0 +1,53 @@
 +package org.bukkit.event.player;
 +
-+import org.apache.commons.lang3.Validate;
++import org.apache.commons.lang.Validate;
 +import org.bukkit.Location;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.HandlerList;

patches/api/0010-Set-multiple-Team-settings-with-a-single-packet.patch

@@ -1,16 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:52:54 -0500
-Subject: [PATCH] Set multiple team settings at once
+Date: Thu, 7 Apr 2022 16:35:36 -0500
+Subject: [PATCH] Set multiple Team settings with a single packet
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 8424fdac153f6dea76acce89f4726408d9726c41..6effaeaf885d70f8aeb11b5c44e7f3ab42cf2a90 100644
+index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..30d2c56d71244e595afccdd47899548f6fb13886 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -514,6 +514,24 @@ public interface Team {
+@@ -534,6 +534,24 @@ public interface Team {
      boolean hasEntity(@NotNull org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException;
-     // Paper end - improve scoreboard entries
+     // Paper end
  
 +    //Slice start
 +    /**

patches/api/0010-Smooth-Teleports.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:55:36 -0500
-Subject: [PATCH] Smooth Teleports
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f9dd00210c1762a40259f823aeb8d8a5ddc78e3e..bb0c49ed971d71904b9172cac2e724133754f32c 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3153,6 +3153,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     String getClientBrandName();
-     // Paper end
- 
-+    /**
-+     * This abuses some of how Minecraft works and allows teleporting a player to another world without
-+     * triggering typical respawn packets. All of natural state of chunk resends, entity adds/removes, etc still
-+     * happen but the visual "refresh" of a world change is hidden. Depending on the destination location/world,
-+     * this can act as a "smooth teleport" to a world if the new world is very similar looking to the old one.
-+     *
-+     * @param location New location to teleport this Player to
-+     */
-+    // Slice start
-+    @org.jetbrains.annotations.ApiStatus.Experimental
-+    void teleportWithoutRespawn(Location location);
-+    // Slice end
-+
-     // Paper start - Teleport API
-     /**
-      * Sets the player's rotation.

patches/api/0011-Equipment-Packet-Caching.patch

@@ -1,16 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 07:36:40 -0500
+Date: Mon, 3 Oct 2022 08:17:50 -0500
 Subject: [PATCH] Equipment Packet Caching
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 19e58e62ae442ef9be02ca7fa2f55e370a54afa4..94aafbc3a08dec7c66cef89de7a5283049a4bf05 100644
+index 31353bd20404a8c2acf6bf0df524dc3cae324272..1a4309bcb529e4ca5cb3bf75e0bf3e65003a8006 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1192,4 +1192,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -910,4 +910,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
-     void setBodyYaw(float bodyYaw);
+     void setHurtDirection(float hurtDirection);
      // Paper end
 +
 +    // Slice start

patches/api/0012-AntiXray-Bypass.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:46:54 -0500
+Date: Sun, 6 Nov 2022 08:29:18 -0600
 Subject: [PATCH] AntiXray Bypass
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bb0c49ed971d71904b9172cac2e724133754f32c..8fc53e32d09f1678d59da0d01f28b6ef96527011 100644
+index 6cd0b10d1dc4506cfb1e4db5e1260cb705566cec..b102687a9c6920b78d284f0531d2d80d6bf86a96 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2950,6 +2950,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2493,6 +2493,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      boolean hasResourcePack();
  

patches/api/0013-PlayerPreChunkLoadEvent.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:47:44 -0500
-Subject: [PATCH] Add PlayerPreChunkLoadEvent
+Date: Mon, 7 Nov 2022 22:44:23 -0600
+Subject: [PATCH] PlayerPreChunkLoadEvent
 
 
 diff --git a/src/main/java/io/papermc/paper/event/packet/PlayerPreChunkLoadEvent.java b/src/main/java/io/papermc/paper/event/packet/PlayerPreChunkLoadEvent.java
@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..b5cc9538a70c7ce0b494d4878d51b521
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 792b1b4ea3330b282961844d48b2dc56e0201c7e..a2b42e723fd7989b410e8c90f235ce38bd1bae45 100644
+index fde06c5d88ffb63910bcb06e3e70e3c0a4af92c7..12d0d7355e7f15a073e1ee895f4fcaa935c4405e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -500,6 +500,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -526,6 +526,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      //@Deprecated // Paper
      public boolean refreshChunk(int x, int z);
  

patches/api/0014-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch

@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:16:51 -0500
-Subject: [PATCH] Add Force Crit to PlayerPreAttackEntityEvent
-
-
-diff --git a/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-index d49999ea597ef247bbf2298e6bf5600bfe003c3e..4ed53b14f94154043e3043f4fef540b45b2b272d 100644
---- a/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-+++ b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-@@ -26,6 +26,7 @@ public class PrePlayerAttackEntityEvent extends PlayerEvent implements Cancellab
-     private final Entity attacked;
-     private boolean cancelled;
-     private final boolean willAttack;
-+    private boolean forceCrit; // Slice
- 
-     public PrePlayerAttackEntityEvent(@NotNull Player who, @NotNull Entity attacked, boolean willAttack) {
-         super(who);
-@@ -55,6 +56,16 @@ public class PrePlayerAttackEntityEvent extends PlayerEvent implements Cancellab
-         return this.willAttack;
-     }
- 
-+    // Slice start
-+    public boolean isForceCrit() {
-+        return forceCrit;
-+    }
-+
-+    public void setForceCrit(boolean forceCrit) {
-+        this.forceCrit = forceCrit;
-+    }
-+    // Slice end
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {

patches/api/0015-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:17:39 -0500
-Subject: [PATCH] Add Preventing KB Bonus to PlayerPreAttackEntityEvent
-
-
-diff --git a/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-index 4ed53b14f94154043e3043f4fef540b45b2b272d..608df52360df66390fce3070e52e4ecd4cd5fb64 100644
---- a/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-+++ b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
-@@ -27,6 +27,7 @@ public class PrePlayerAttackEntityEvent extends PlayerEvent implements Cancellab
-     private boolean cancelled;
-     private final boolean willAttack;
-     private boolean forceCrit; // Slice
-+    private boolean preventKnockbackBonus; // Slice
- 
-     public PrePlayerAttackEntityEvent(@NotNull Player who, @NotNull Entity attacked, boolean willAttack) {
-         super(who);
-@@ -64,6 +65,15 @@ public class PrePlayerAttackEntityEvent extends PlayerEvent implements Cancellab
-     public void setForceCrit(boolean forceCrit) {
-         this.forceCrit = forceCrit;
-     }
-+
-+    public boolean isPreventKnockbackBonus() {
-+        return preventKnockbackBonus;
-+    }
-+
-+    public void setPreventKnockbackBonus(boolean preventKnockbackBonus) {
-+        this.preventKnockbackBonus = preventKnockbackBonus;
-+    }
-+
-     // Slice end
- 
-     @NotNull

patches/api/0016-PlayerLoadStatsEvent.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:25:26 -0500
-Subject: [PATCH] PlayerLoadStatsEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLoadStatsEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLoadStatsEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..80b67d390152b114ad385f7eb6af5ef975b7ca20
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLoadStatsEvent.java
-@@ -0,0 +1,54 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import com.google.gson.JsonObject;
-+import org.bukkit.Bukkit;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+import java.util.UUID;
-+
-+/**
-+ * Calls an event in which player stats can be provided. If null, will load from disk, otherwise will use provided data
-+ */
-+public class PlayerLoadStatsEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+    private final UUID playerId;
-+    private JsonObject statistics;
-+
-+    public PlayerLoadStatsEvent(@NotNull UUID playerId) {
-+        super(!Bukkit.isPrimaryThread());
-+        this.playerId = playerId;
-+    }
-+
-+    /**
-+     * Gets the player's unique ID.
-+     *
-+     * @return The unique ID
-+     */
-+    @NotNull
-+    public UUID getUniqueId() {
-+        return playerId;
-+    }
-+
-+    @Nullable
-+    public JsonObject getStatistics() {
-+        return statistics;
-+    }
-+
-+    public void setStatistics(@NotNull JsonObject statistics) {
-+        this.statistics = statistics;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}

patches/api/0017-Warden-setCanDespawn-API.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Fri, 23 Jun 2023 11:21:27 -0500
-Subject: [PATCH] Warden setCanDespawn API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Warden.java b/src/main/java/org/bukkit/entity/Warden.java
-index efaa45f41bc1dc8df6665c55b4e5ade343d60d4c..36ea5429b9a18a857fd1fea30b52f69a182c7ede 100644
---- a/src/main/java/org/bukkit/entity/Warden.java
-+++ b/src/main/java/org/bukkit/entity/Warden.java
-@@ -111,4 +111,6 @@ public interface Warden extends Monster {
-          */
-         ANGRY;
-     }
--}
-+
-+    void setCanDespawn(boolean canDespawn); // Slice
-+}
-\ No newline at end of file

patches/api/0018-Add-reason-to-PlayerConnectionCloseEvent.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 22 Aug 2023 06:22:17 -0500
-Subject: [PATCH] Add reason to PlayerConnectionCloseEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
-index 12c1c6fe9dc8dc5f5faf6dcf99f6857219ef22b8..42954466c13a926e735754949cc9d78fa1ad7b10 100644
---- a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java
-@@ -50,12 +50,18 @@ public class PlayerConnectionCloseEvent extends Event {
-     @NotNull private final UUID playerUniqueId;
-     @NotNull private final String playerName;
-     @NotNull private final InetAddress ipAddress;
-+    @NotNull private final ConnectionCloseReason reason;
- 
-     public PlayerConnectionCloseEvent(@NotNull final UUID playerUniqueId, @NotNull final String playerName, @NotNull final InetAddress ipAddress, final boolean async) {
-+        this(playerUniqueId, playerName, ipAddress, ConnectionCloseReason.NORMAL, async);
-+    }
-+
-+    public PlayerConnectionCloseEvent(@NotNull final UUID playerUniqueId, @NotNull final String playerName, @NotNull final InetAddress ipAddress, @NotNull ConnectionCloseReason reason, final boolean async) {
-         super(async);
-         this.playerUniqueId = playerUniqueId;
-         this.playerName = playerName;
-         this.ipAddress = ipAddress;
-+        this.reason = reason;
-     }
- 
-     /**
-@@ -92,4 +98,26 @@ public class PlayerConnectionCloseEvent extends Event {
-     public static HandlerList getHandlerList() {
-         return HANDLERS;
-     }
-+
-+    /**
-+     * Returns the reason for the closed connection.
-+     */
-+    @NotNull
-+    public ConnectionCloseReason getReason() {
-+        return this.reason;
-+    }
-+
-+    public enum ConnectionCloseReason {
-+        /**
-+         * Player disconnected normally
-+         */
-+        NORMAL,
-+
-+        /**
-+         * Player has invalid data for some reason.
-+         * <p>
-+         * One example of this is a player logging into an unloaded world.
-+         */
-+        INVALID_PLAYER_DATA,
-+    }
- }

patches/api/0019-Add-timeDamaged-to-EntityDamageEvent.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sun, 10 Sep 2023 07:41:26 -0500
-Subject: [PATCH] Add timeDamaged to EntityDamageEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-index 4773f537dec20d6ebd82e4b145a1cdea0077fe90..f7a6346bc7eecc57fa7d69c801afa15230496f3c 100644
---- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-@@ -27,6 +27,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
-     private final Map<DamageModifier, Double> originals;
-     private boolean cancelled;
-     private final DamageCause cause;
-+    private long timeDamaged = System.currentTimeMillis(); // Slice
- 
-     public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
-         this(damagee, cause, new EnumMap<DamageModifier, Double>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
-@@ -193,6 +194,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
-         return cause;
-     }
- 
-+    // Slice start
-+    /**
-+     * @return Get the time the damage event happened.
-+     */
-+    public long getTimeDamaged() {
-+        return timeDamaged;
-+    }
-+
-+    /**
-+     * @param timeDamaged Set the time the damage event happened, if you so choose.
-+     */
-+    public void setTimeDamaged(long timeDamaged) {
-+        this.timeDamaged = timeDamaged;
-+    }
-+    // Slice end
-+
-     @NotNull
-     @Override
-     public HandlerList getHandlers() {

patches/api/0020-Non-saveable-entities.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sat, 21 Oct 2023 11:27:53 -0500
-Subject: [PATCH] Non-saveable entities
-
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..234ad94cf73caaac64d0917cf0d761c1d4c5d6b5 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1049,4 +1049,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-      */
-     @NotNull String getScoreboardEntryName();
-     // Paper end - entity scoreboard name
-+
-+    // Slice start
-+    /**
-+     * Returns true if the entity can be saved. If false, the entity will never be serialized or saved.
-+     */
-+    boolean isSaveable();
-+
-+    /**
-+     * Sets whether the entity can be serialized and saved to disk.
-+     *
-+     * @param saveable the saveable status
-+     * @see #isSaveable()
-+     */
-+    void setSaveable(boolean saveable);
-+    // Slice end
- }

patches/api/0021-ChunkStatusChangeEvent.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sun, 22 Oct 2023 08:41:09 -0500
-Subject: [PATCH] ChunkStatusChangeEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/chunk/ChunkStatusChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/chunk/ChunkStatusChangeEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..512664d4a7a6821b8d79d0aabf5c31a61fcae6b9
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/chunk/ChunkStatusChangeEvent.java
-@@ -0,0 +1,58 @@
-+package com.destroystokyo.paper.event.chunk;
-+
-+import org.bukkit.Chunk;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when the Full Status of a Chunk changes
-+ */
-+public class ChunkStatusChangeEvent extends Event {
-+
-+    private static final HandlerList handlers = new HandlerList();
-+    private final Chunk chunk;
-+    private final ChunkStatus currentState;
-+    private final ChunkStatus newState;
-+
-+    public ChunkStatusChangeEvent(Chunk chunk, ChunkStatus currentState, ChunkStatus newState) {
-+        super();
-+        this.chunk = chunk;
-+        this.currentState = currentState;
-+        this.newState = newState;
-+    }
-+
-+    public Chunk getChunk() {
-+        return chunk;
-+    }
-+
-+    public ChunkStatus getCurrentState() {
-+        return currentState;
-+    }
-+
-+    public ChunkStatus getNewState() {
-+        return newState;
-+    }
-+
-+    public boolean isUpgrade() {
-+        return newState.ordinal() > currentState.ordinal();
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    public enum ChunkStatus {
-+        INACCESSIBLE,
-+        FULL,
-+        BLOCK_TICKING,
-+        ENTITY_TICKING;
-+    }
-+}

patches/server/0001-Build-changes.patch

@@ -1,29 +1,29 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
-Date: Fri, 12 Aug 2022 08:07:34 -0500
-Subject: [PATCH] Build Changes
+Date: Sat, 12 Jun 2021 16:40:34 +0200
+Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2e1cea360bb6ff85eb8da54237bc407653eb91f6 100644
+index 0282e3b75470e1a68ea1fc228082483514ba432e..73ce9e6171020fc4abc70d61c4587b9eeae9ae2f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
+@@ -9,8 +9,12 @@ plugins {
+ }
  
  dependencies {
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
 +    // Slice start
 +    implementation(project(":slice-api"))
-+    implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
++    implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") {
 +        exclude("io.papermc.paper", "paper-api")
 +    }
 +    // Slice end
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -72,7 +76,7 @@ tasks.jar {
+@@ -60,7 +64,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2e1cea360bb6ff85eb8da54237bc4076
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -149,7 +153,7 @@ fun TaskContainer.registerRunTask(
+@@ -148,7 +152,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -42,10 +42,10 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2e1cea360bb6ff85eb8da54237bc4076
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..915340fedc6c0b3d70ee065482dbe621b7c0b0a8 100644
+index c8d56947305c981a3268ce4ae3e975db350ceff2..ce51ebeb5df07abc4a8bb31bc737ab3e4214ce83 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1692,7 +1692,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -55,10 +55,10 @@ index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..915340fedc6c0b3d70ee065482dbe621
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ec4b73321205b472f19fa5bd4ad95893020d1340..2fdc3bcea74b82d7155617d77100b100d8e56047 100644
+index ab843069ac0653d03cf3f925f49555016cad84fa..e09ae5f7684113d60d2672bc4bfc8543bce2f54f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
+@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {

patches/server/0002-Add-PlayerShieldDisableEvent.patch

@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Sun, 27 Feb 2022 09:47:57 -0600
+Subject: [PATCH] Add PlayerShieldDisableEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index e3227a806d9e19923783122ea94ae19e7dbe71da..61ad475364346efe7cf3f3d8db07753075d6edb9 100644
+--- a/src/main/java/net/minecraft/world/entity/Mob.java
++++ b/src/main/java/net/minecraft/world/entity/Mob.java
+@@ -1608,7 +1608,10 @@ public abstract class Mob extends LivingEntity {
+             float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
+ 
+             if (this.random.nextFloat() < f) {
+-                player.getCooldowns().addCooldown(Items.SHIELD, 100);
++                //Slice start
++                io.papermc.paper.event.player.PlayerShieldDisableEvent shieldDisableEvent = new io.papermc.paper.event.player.PlayerShieldDisableEvent((org.bukkit.entity.Player) player.getBukkitEntity(), getBukkitEntity(), 100);
++                if (!shieldDisableEvent.callEvent()) return; // Slice
++                player.getCooldowns().addCooldown(Items.SHIELD, shieldDisableEvent.getCooldown());
+                 this.level.broadcastEntityEvent(player, (byte) 30);
+             }
+         }
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index 2483d7df7f1bf94344afd38b37602c645a4a2dff..0156525637f8aa2e4e639bc493d8617b5af4cc32 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -949,7 +949,7 @@ public abstract class Player extends LivingEntity {
+     protected void blockUsingShield(LivingEntity attacker) {
+         super.blockUsingShield(attacker);
+         if (attacker.getMainHandItem().getItem() instanceof AxeItem) {
+-            this.disableShield(true);
++            this.disableShield(true, attacker); // Slice
+         }
+ 
+     }
+@@ -1420,6 +1420,12 @@ public abstract class Player extends LivingEntity {
+     }
+ 
+     public void disableShield(boolean sprinting) {
++        // Slice start
++        disableShield(sprinting, null);
++    }
++
++    public void disableShield(boolean sprinting, @Nullable LivingEntity attacker) {
++        // Slice end
+         float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
+ 
+         if (sprinting) {
+@@ -1427,7 +1433,12 @@ public abstract class Player extends LivingEntity {
+         }
+ 
+         if (this.random.nextFloat() < f) {
+-            this.getCooldowns().addCooldown(Items.SHIELD, 100);
++            // Slice start
++            org.bukkit.entity.Entity finalAttacker = attacker != null ? attacker.getBukkitEntity() : null;
++            io.papermc.paper.event.player.PlayerShieldDisableEvent shieldDisableEvent = new io.papermc.paper.event.player.PlayerShieldDisableEvent((org.bukkit.entity.Player) getBukkitEntity(), finalAttacker, 100);
++            if (!shieldDisableEvent.callEvent()) return;
++            this.getCooldowns().addCooldown(Items.SHIELD, shieldDisableEvent.getCooldown());
++            // Slice end
+             this.stopUsingItem();
+             this.level.broadcastEntityEvent(this, (byte) 30);
+         }

patches/server/0003-Set-BlockData-without-light-update.patch

@@ -1,36 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:29:11 -0500
-Subject: [PATCH] Set BlockData without light updates
+From: Tom <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 08:40:41 -0600
+Subject: [PATCH] Set BlockData without light update
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 877498729c66de9aa6a27c9148f7494d7895615c..63959d7f15c682c2935f872d50de03fdacf95db4 100644
+index 1e656438d9ee89b97c660f3b3ec671be6546c6b7..787c14495616c2ccc6cbb41a44010f1ede1ff16d 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -235,7 +235,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -225,7 +225,7 @@ public class WorldGenRegion implements WorldGenLevel {
                  Block.dropResources(iblockdata, this.level, pos, tileentity, breakingEntity, ItemStack.EMPTY);
              }
  
 -            return this.setBlock(pos, Blocks.AIR.defaultBlockState(), 3, maxUpdateDepth);
-+            return this.setBlock(pos, Blocks.AIR.defaultBlockState(), 3, maxUpdateDepth, true); // Slice
++            return this.setBlock(pos, Blocks.AIR.defaultBlockState(), 3, maxUpdateDepth, true);
          }
      }
  
-@@ -310,7 +310,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -300,7 +300,7 @@ public class WorldGenRegion implements WorldGenLevel {
      }
  
      @Override
 -    public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
-+    public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { // Slice
++    public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) {
          if (!this.ensureCanWrite(pos)) {
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 773bfdd3ed457a352b5329f280c0d10297d579ba..c7ee934d4f890bc86596d36079ffed5050133b47 100644
+index 160c0f37aa3aaf7598f852acf9bd444f79444c97..8b6ea24dc8d0286c0814c86dcf4c51cacc572854 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -598,12 +598,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -495,12 +495,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      @Override
@@ -46,7 +46,16 @@ index 773bfdd3ed457a352b5329f280c0d10297d579ba..c7ee934d4f890bc86596d36079ffed50
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
              // Paper start
-@@ -794,7 +794,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -547,7 +547,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+             } else {
+                 BlockState iblockdata2 = this.getBlockState(pos);
+ 
+-                if ((flags & 128) == 0 && iblockdata2 != iblockdata1 && (iblockdata2.getLightBlock(this, pos) != iblockdata1.getLightBlock(this, pos) || iblockdata2.getLightEmission() != iblockdata1.getLightEmission() || iblockdata2.useShapeForLightOcclusion() || iblockdata1.useShapeForLightOcclusion())) {
++                if (checkLight && (flags & 128) == 0 && iblockdata2 != iblockdata1 && (iblockdata2.getLightBlock(this, pos) != iblockdata1.getLightBlock(this, pos) || iblockdata2.getLightEmission() != iblockdata1.getLightEmission() || iblockdata2.useShapeForLightOcclusion() || iblockdata1.useShapeForLightOcclusion())) {
+                     this.getProfiler().push("queueCheckLight");
+                     this.getChunkSource().getLightEngine().checkBlock(pos);
+                     this.getProfiler().pop();
+@@ -694,7 +694,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  Block.dropResources(iblockdata, this, pos, tileentity, breakingEntity, ItemStack.EMPTY);
              }
  
@@ -54,7 +63,7 @@ index 773bfdd3ed457a352b5329f280c0d10297d579ba..c7ee934d4f890bc86596d36079ffed50
 +            boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth, true);
  
              if (flag1) {
-                 this.gameEvent(GameEvent.BLOCK_DESTROY, pos, GameEvent.Context.of(breakingEntity, iblockdata));
+                 this.gameEvent(breakingEntity, GameEvent.BLOCK_DESTROY, pos);
 diff --git a/src/main/java/net/minecraft/world/level/LevelWriter.java b/src/main/java/net/minecraft/world/level/LevelWriter.java
 index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc24bbe681e 100644
 --- a/src/main/java/net/minecraft/world/level/LevelWriter.java
@@ -77,23 +86,23 @@ index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc2
  
      boolean removeBlock(BlockPos pos, boolean move);
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index fdd9c61b7248e92dbcbec91cd6fe4c6310bba237..2f2197236d9ba64b62510df923378b0256629d02 100644
+index a80f4dc0a642c744223a155232291ace6e007636..fda1cb8ac3fa78375d90d6bc9f05a78f58d18193 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -194,7 +194,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -196,7 +196,7 @@ public class Block extends BlockBehaviour implements ItemLike {
                      world.destroyBlock(pos, (flags & 32) == 0, (Entity) null, maxUpdateDepth);
                  }
              } else {
 -                world.setBlock(pos, newState, flags & -33, maxUpdateDepth);
-+                world.setBlock(pos, newState, flags & -33, maxUpdateDepth, true); // Slice
++                world.setBlock(pos, newState, flags & -33, maxUpdateDepth, true);
              }
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index bf2cd1eb04c10b8422ddca8efd397290bf58ea4d..30dcafc3ebcb5ab230a5622a0108aa3d7e3c4ead 100644
+index e231636403a70f28e7e4bf51542608872234ce94..47b067f820dbe1d6304e30721afd7a8fd05d2032 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -286,7 +286,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -270,7 +270,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
          BlockPos pos = new BlockPos(x, y, z);
          net.minecraft.world.level.block.state.BlockState old = this.getHandle().getBlockState(pos);
  
@@ -103,7 +112,7 @@ index bf2cd1eb04c10b8422ddca8efd397290bf58ea4d..30dcafc3ebcb5ab230a5622a0108aa3d
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index f3ac362b7b65a5273ff5fdad1d8065c5f654a53a..2c60ae8b5adb60c49712327bda3c2666778fd729 100644
+index a52e76c8870b1dd578c4332930c6f2fd3b31d471..1ed2dcb6f28a391689b5dd10073422bae1dcd8bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -187,15 +187,20 @@ public class CraftBlock implements Block {
@@ -141,10 +150,10 @@ index f3ac362b7b65a5273ff5fdad1d8065c5f654a53a..2c60ae8b5adb60c49712327bda3c2666
                  world.getMinecraftWorld().sendBlockUpdated(
                          position,
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index b1abb332eca597b23888bca42d21d5b587f61b13..7286394d1de13247870aac7c3110964bf01a7078 100644
+index 966ac60daebb7bb211ab8096fc0c5f33db67320a..d68b046e30d0f3d186ed90b7c36086ccd889de1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-@@ -208,7 +208,7 @@ public class CraftBlockState implements BlockState {
+@@ -213,7 +213,7 @@ public class CraftBlockState implements BlockState {
          }
  
          net.minecraft.world.level.block.state.BlockState newBlock = this.data;
@@ -154,10 +163,10 @@ index b1abb332eca597b23888bca42d21d5b587f61b13..7286394d1de13247870aac7c3110964b
              this.world.getHandle().sendBlockUpdated(
                      position,
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 0b7d882551bcb8be149754209aad5fe4142f0fac..db3a7b550b1fa0654ba76f522a8163135f222281 100644
+index 34e2e14ebb007cceb8b64d3eb321646e834215d4..c0428b6e1cc9f2ca84b3ee718e28b15ce496261c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -245,7 +245,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
+@@ -238,7 +238,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
      }
  
      @Override

patches/server/0004-Don-t-send-equipment-updates-if-only-durability-chan.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 08:43:22 -0600
+Subject: [PATCH] Don't send equipment updates if only durability changed
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index fdd76d1a1636f30f519c434b41061d826c4a8261..39980b411528f148ed27099669d1acc6cb332c18 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3031,7 +3031,7 @@ public abstract class LivingEntity extends Entity {
+ 
+             ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
+ 
+-            if (!ItemStack.matches(itemstack1, itemstack)) {
++            if (!ItemStack.isSameIgnoreDurability(itemstack1, itemstack)) {
+                 // Paper start - PlayerArmorChangeEvent
+                 if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.ARMOR) {
+                     final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);

patches/server/0005-Allow-opening-covered-chests.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 18 Apr 2023 07:49:59 -0500
+Date: Mon, 28 Feb 2022 08:45:30 -0600
 Subject: [PATCH] Allow opening covered chests
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72aa8653724 100644
+index db726697b00afdee6078849fd224263483349912..cc415e4dd2093aa658817589f4f286c1a3ee63ad 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -355,9 +355,10 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
+@@ -356,9 +356,10 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
  
      private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) {
@@ -23,10 +23,10 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..0f15e574b5c0cc8648bc1c0a12f1c72a
  
      private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index 7385e91f32f070e86a4e0fd3d214f55d832c7979..4911b099f865b9202286f51087e5c00ffeaa95a5 100644
+index 16d677234616daec24e7250ff3e93aa3a83e9715..ee12ef106fa2dcbbac0161d96f383efbdd96bf94 100644
 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -76,10 +76,10 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+@@ -77,10 +77,10 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
          PlayerEnderChestContainer playerEnderChestContainer = player.getEnderChestInventory();
          BlockEntity blockEntity = world.getBlockEntity(pos);
          if (playerEnderChestContainer != null && blockEntity instanceof EnderChestBlockEntity) {

patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch

@@ -1,17 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 18 Apr 2023 07:50:34 -0500
-Subject: [PATCH] Don't send fire packets if player has FR
+Date: Mon, 28 Feb 2022 08:46:13 -0600
+Subject: [PATCH] Don't send fire packets if player has Fire Resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e8485fb900b25e911a858678a833852731cb2ace..a0f8740c93fe86d4c49b9e43f1044ef03d8e3de7 100644
+index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..7fcb2ecae7ec9a457e00a6a3ea1fb7b589360e02 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -868,7 +868,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -781,7 +781,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
-         this.checkBelowWorld();
-         if (!this.level().isClientSide) {
+         this.checkOutOfWorld();
+         if (!this.level.isClientSide) {
 -            this.setSharedFlagOnFire(this.remainingFireTicks > 0);
 +            if (this instanceof net.minecraft.world.entity.LivingEntity livingEntity) {
 +                this.setSharedFlagOnFire(this.remainingFireTicks > 0 && !livingEntity.hasEffect(net.minecraft.world.effect.MobEffects.FIRE_RESISTANCE));

patches/server/0007-Track-Player-throughout-block-destroy.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:30:29 -0500
-Subject: [PATCH] Add BlockDestroyedByNeighborEvent
+Date: Mon, 28 Feb 2022 08:53:55 -0600
+Subject: [PATCH] Track Player throughout block destroy
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..ec94d787f227c373637e6bb5f38260d978fe14df 100644
+index 415b6c2bbf11c5a2ac75d18f52b93f80b9e14fe4..a33431984b6051efd39f0077c55186da789d1d60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -419,6 +419,7 @@ public class ServerPlayerGameMode {
+@@ -451,6 +451,7 @@ public class ServerPlayerGameMode {
                  org.bukkit.block.BlockState state = bblock.getState();
                  level.captureDrops = new ArrayList<>();
                  // CraftBukkit end
@@ -16,7 +16,7 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..ec94d787f227c373637e6bb5f38260d9
                  block.playerWillDestroy(this.level, pos, iblockdata, this.player);
                  boolean flag = this.level.removeBlock(pos, false);
  
-@@ -447,6 +448,7 @@ public class ServerPlayerGameMode {
+@@ -479,6 +480,7 @@ public class ServerPlayerGameMode {
                  // CraftBukkit start
                  java.util.List<net.minecraft.world.entity.item.ItemEntity> itemsToDrop = level.captureDrops; // Paper - store current list
                  level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff
@@ -25,22 +25,22 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..ec94d787f227c373637e6bb5f38260d9
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 879cc823d56625867eb73bb621db6a13f40ad81c..2b3b1c5ccdf58ee9b46d404cfa3790d0fdc2df3d 100644
+index 6837c965592d4584cfc958a1008b98791a0fc780..070dab06db870f3c67dffe7637fe1a92c7eaa6a8 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -352,6 +352,7 @@ public final class ItemStack {
-             CompoundTag oldData = this.getTagClone();
-             int oldCount = this.getCount();
-             ServerLevel world = (ServerLevel) context.getLevel();
+@@ -333,6 +333,7 @@ public final class ItemStack {
+                 }
+             }
+             Item item = this.getItem();
 +            if (entityhuman != null) world.pendingPlayerBlockEvents.put(blockposition, new Level.PendingBlockEvent(blockposition, entityhuman)); // Paper
- 
-             if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - capture block states for snow buckets
-                 world.captureBlockStates = true;
+             InteractionResult enuminteractionresult = item.useOn(itemactioncontext);
+             CompoundTag newData = this.getTagClone();
+             int newCount = this.getCount();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c7ee934d4f890bc86596d36079ffed5050133b47..1d17c6471449fe4f4fd2bae6bc8a9c500fb0c96f 100644
+index b2fd675cfe9301b0cfc42a8e9bba3fb8356b4789..be12155798e5ad6ae8bf47acfbfdb5b20ad45fe5 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -184,6 +184,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -172,6 +172,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
@@ -68,7 +68,7 @@ index c7ee934d4f890bc86596d36079ffed5050133b47..1d17c6471449fe4f4fd2bae6bc8a9c50
      // Paper start - fix and optimise world upgrading
      // copied from below
      public static ResourceKey<DimensionType> getDimensionKey(DimensionType manager) {
-@@ -748,6 +769,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -649,6 +670,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (!this.preventPoiUpdated) {
                  this.onBlockStateChange(blockposition, iblockdata1, iblockdata2);
              }
@@ -76,61 +76,56 @@ index c7ee934d4f890bc86596d36079ffed5050133b47..1d17c6471449fe4f4fd2bae6bc8a9c50
              // CraftBukkit end
          }
      }
-@@ -769,6 +791,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         if (iblockdata.isAir()) {
-             return false;
-         } else {
-+            // Paper start
-+            PendingBlockEvent blockEvent = pendingPlayerBlockEvents.get(pos);
-+            if (blockEvent != null && blockEvent.sourceBlock != null) {
-+                io.papermc.paper.event.block.BlockDestroyedByNeighborEvent event =
-+                    new io.papermc.paper.event.block.BlockDestroyedByNeighborEvent(org.bukkit.craftbukkit.block.CraftBlock.at(this, pos),
-+                        (org.bukkit.entity.Player) blockEvent.player.getBukkitEntity(),
-+                        org.bukkit.craftbukkit.block.CraftBlock.at(this, blockEvent.sourceBlock));
-+                event.callEvent();
+@@ -754,8 +776,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     public void neighborChanged(BlockPos pos, Block sourceBlock, BlockPos neighborPos) {
+         if (!this.isClientSide) {
+             BlockState iblockdata = this.getBlockState(pos);
++            org.bukkit.block.Block blockAt = world.getBlockAt(pos.getX(), pos.getY(), pos.getZ()); // Paper
+ 
+             try {
++                // Paper start - If this is a non-air block being set to an air block, get (remove, if exists)
++                // our PendingBlockEvent
++                if (blockAt.getType() != org.bukkit.Material.AIR && iblockdata.getMaterial() == net.minecraft.world.level.material.Material.AIR) {
++                    PendingBlockEvent blockEvent = pendingPlayerBlockEvents.remove(pos);
++                    if (blockEvent != null) {
++                        //Would fire a future BlockDestroyedByNeighborEvent here, but must have this conditional block
++                        //because it's important to remove from pendingPlayerBlockEvents
++                    }
 +                }
 +                // Paper end
 +
-             FluidState fluid = this.getFluidState(pos);
-             // Paper start - while the above setAir method is named same and looks very similar
-             // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent,
+                 // CraftBukkit start
+                 CraftWorld world = ((ServerLevel) this).getWorld();
+                 if (world != null && ((ServerLevel)this).hasPhysicsEvent) { // Paper
 diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-index 030b38d5d5d2578d6ef482a239ef58787efa3b08..329053cf5c342747985f9079e87edc6f883bfa1e 100644
+index e12b76238cb52a1007f2102473b7f892f8521b62..301dfb74fec49b7f6f0452e4c49c8f1df43c0180 100644
 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-@@ -105,6 +105,15 @@ public class DoublePlantBlock extends BushBlock {
+@@ -104,6 +104,12 @@ public class DoublePlantBlock extends BushBlock {
              BlockPos blockposition1 = pos.below();
              BlockState iblockdata1 = world.getBlockState(blockposition1);
  
 +            Level.PendingBlockEvent blockEvent = world.pendingPlayerBlockEvents.remove(pos);
 +            if (blockEvent != null) {
-+                io.papermc.paper.event.block.BlockDestroyedByNeighborEvent event =
-+                    new io.papermc.paper.event.block.BlockDestroyedByNeighborEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition1),
-+                        (org.bukkit.entity.Player) blockEvent.player.getBukkitEntity(),
-+                        org.bukkit.craftbukkit.block.CraftBlock.at(world, pos));
-+                if (!event.callEvent()) return;
++                //Would fire a future BlockDestroyedByNeighborEvent here, but must have this conditional block
++                //because it's important to remove from pendingPlayerBlockEvents
 +            }
 +
              if (iblockdata1.is(state.getBlock()) && iblockdata1.getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER) {
-                 BlockState iblockdata2 = iblockdata1.getFluidState().is((Fluid) Fluids.WATER) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState();
+                 BlockState iblockdata2 = iblockdata1.hasProperty(BlockStateProperties.WATERLOGGED) && (Boolean) iblockdata1.getValue(BlockStateProperties.WATERLOGGED) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index de4c1e4701236e7d5ec77339c51ad6a9d8288bb6..4beb56de55d5584ce7f6e04ae30f7c3cffc1440e 100644
+index 7f83c9390823b42fc30d04e1d3222e2825eaad50..a099fcaabe26378157c429ad899714fd3227f9ef 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -1127,11 +1127,22 @@ public abstract class BlockBehaviour implements FeatureElement {
-             BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
-             Direction[] aenumdirection = BlockBehaviour.UPDATE_SHAPE_ORDER;
-             int k = aenumdirection.length;
-+            BlockState blockState = world.getBlockState(pos); // Slice
- 
-             for (int l = 0; l < k; ++l) {
-                 Direction enumdirection = aenumdirection[l];
+@@ -988,6 +988,18 @@ public abstract class BlockBehaviour {
  
                  blockposition_mutableblockposition.setWithOffset(pos, enumdirection);
+                 BlockState iblockdata = world.getBlockState(blockposition_mutableblockposition);
++
 +                // Paper start - Propagate the PendingBlockEvent from the current blockPos to the next block
 +                // if it will break (!canSurvive)
-+                if (blockState.getBukkitMaterial() == org.bukkit.Material.AIR && !world.getBlockState(blockposition_mutableblockposition).canSurvive(world, blockposition_mutableblockposition)) {
++                if (this.getMaterial() == Material.AIR && !iblockdata.canSurvive(world, blockposition_mutableblockposition)) {
 +                    Level.PendingBlockEvent blockEvent = ((Level) world).pendingPlayerBlockEvents.get(pos);
 +                    if (blockEvent != null) {
 +                        BlockPos blockPosCopy = blockposition_mutableblockposition.immutable();
@@ -138,6 +133,7 @@ index de4c1e4701236e7d5ec77339c51ad6a9d8288bb6..4beb56de55d5584ce7f6e04ae30f7c3c
 +                    }
 +                }
 +                // Paper end
-                 world.neighborShapeChanged(enumdirection.getOpposite(), this.asState(), blockposition_mutableblockposition, pos, flags, maxUpdateDepth);
-             }
++
+                 BlockState iblockdata1 = iblockdata.updateShape(enumdirection.getOpposite(), this.asState(), world, blockposition_mutableblockposition, pos);
  
+                 Block.updateOrDestroy(iblockdata, iblockdata1, world, blockposition_mutableblockposition, flags, maxUpdateDepth);

patches/server/0008-Add-BlockDestroyedByNeighborEvent.patch

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 08:54:52 -0600
+Subject: [PATCH] Add BlockDestroyedByNeighborEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 6764f174d0685c02d5e81aa38228d02a77bf9632..0bd21a1eeb33ffb7e3299d864e8160627d6f88d9 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -692,6 +692,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         if (iblockdata.isAir()) {
+             return false;
+         } else {
++            // Paper start
++            PendingBlockEvent blockEvent = pendingPlayerBlockEvents.get(pos);
++            if (blockEvent != null && blockEvent.sourceBlock != null) {
++                io.papermc.paper.event.block.BlockDestroyedByNeighborEvent event =
++                    new io.papermc.paper.event.block.BlockDestroyedByNeighborEvent(org.bukkit.craftbukkit.block.CraftBlock.at(this, pos),
++                        (org.bukkit.entity.Player) blockEvent.player.getBukkitEntity(),
++                        org.bukkit.craftbukkit.block.CraftBlock.at(this, blockEvent.sourceBlock));
++                event.callEvent();
++            }
++            // Paper end
++
+             FluidState fluid = this.getFluidState(pos);
+             // Paper start - while the above setAir method is named same and looks very similar
+             // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent,
+diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
+index 301dfb74fec49b7f6f0452e4c49c8f1df43c0180..6b63bc56bfa757a17f9a6f98b31861a7f350be80 100644
+--- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
+@@ -106,8 +106,11 @@ public class DoublePlantBlock extends BushBlock {
+ 
+             Level.PendingBlockEvent blockEvent = world.pendingPlayerBlockEvents.remove(pos);
+             if (blockEvent != null) {
+-                //Would fire a future BlockDestroyedByNeighborEvent here, but must have this conditional block
+-                //because it's important to remove from pendingPlayerBlockEvents
++                io.papermc.paper.event.block.BlockDestroyedByNeighborEvent event =
++                    new io.papermc.paper.event.block.BlockDestroyedByNeighborEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition1),
++                        (org.bukkit.entity.Player) blockEvent.player.getBukkitEntity(),
++                        org.bukkit.craftbukkit.block.CraftBlock.at(world, pos));
++                if (!event.callEvent()) return;
+             }
+ 
+             if (iblockdata1.is(state.getBlock()) && iblockdata1.getValue(DoublePlantBlock.HALF) == DoubleBlockHalf.LOWER) {

patches/server/0009-Add-Player-to-SpongeAbsorbEvent.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:36:21 -0500
+Date: Mon, 28 Feb 2022 08:55:29 -0600
 Subject: [PATCH] Add Player to SpongeAbsorbEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index 4bce895268542531598a01a1bccd8ac1ed703b7d..8b552fc58a2909bced07eb743dd5d76c0357f9ab 100644
+index 11b40defd5f5362346fd8a70a1141cd6425cefa7..48541be0c1cbe33d4dad1158683ab25447ecf5cf 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-@@ -104,7 +104,8 @@ public class SpongeBlock extends Block {
+@@ -109,7 +109,8 @@ public class SpongeBlock extends Block {
          if (!blocks.isEmpty()) {
              final org.bukkit.block.Block bblock = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
  

patches/server/0010-Add-provided-Material-to-getDrops.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:31:54 -0500
+Date: Mon, 28 Feb 2022 08:56:16 -0600
 Subject: [PATCH] Add provided Material to getDrops
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 243b5823ea99eefd812134b5c80d4d3c9f008499..ee97b4352fcdb3fd55eeb5a4a57981b2f0aed28b 100644
+index 21131dd9b2858c912712d5ded9e2fff274d439d2..982e879bc0478a2faf41b28a56a48ea5fc69c5ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -616,7 +616,18 @@ public class CraftBlock implements Block {
+@@ -592,7 +592,18 @@ public class CraftBlock implements Block {
  
      @Override
      public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
@@ -28,7 +28,7 @@ index 243b5823ea99eefd812134b5c80d4d3c9f008499..ee97b4352fcdb3fd55eeb5a4a57981b2
          net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);
  
          // Modelled off EntityHuman#hasBlock
-@@ -627,6 +638,7 @@ public class CraftBlock implements Block {
+@@ -603,6 +614,7 @@ public class CraftBlock implements Block {
              return Collections.emptyList();
          }
      }

patches/server/0010-Smooth-Teleports.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:55:35 -0500
-Subject: [PATCH] Smooth Teleports
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 161c40692e8d469fad4169908b9353be0f85d0d8..2b93a37ee1f711c14140eb96f29dfdd3290641ad 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
-     public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
-     public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
-     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
-+    public boolean smoothWorldTeleport; // Slice
- 
-     private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
-     public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 20a0b9835c47ca153a6f77dacf4b775de32e4ef2..97c6f1c622af02b3761b23a4d3a67b385e45ea84 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -935,12 +935,12 @@ public abstract class PlayerList {
-         int i = flag ? 1 : 0;
-         // CraftBukkit start
-         LevelData worlddata = worldserver1.getLevelData();
--        entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), (byte) i, entityplayer1.getLastDeathLocation(), entityplayer1.getPortalCooldown()));
-+        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeId(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), (byte) i, entityplayer1.getLastDeathLocation(), entityplayer1.getPortalCooldown()));
-         entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.getWorld().getSendViewDistance())); // Spigot // Paper - replace old player chunk management
-         entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.getWorld().getSimulationDistance())); // Spigot // Paper - replace old player chunk management
-         entityplayer1.spawnIn(worldserver1);
-         entityplayer1.unsetRemoved();
--        entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver1.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot()));
-+        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.teleport(CraftLocation.toBukkit(entityplayer1.position(), worldserver1.getWorld(), entityplayer1.getYRot(), entityplayer1.getXRot()));
-         entityplayer1.setShiftKeyDown(false);
- 
-         // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4e6fea7cf11b1e29ae7c7098a6f5d06bb5f93cc2..767a33cdce4b438164bf4101ff39cd7b1e8f929e 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1254,6 +1254,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         // Paper end
-     }
- 
-+    // Slice start
-+    public void teleportWithoutRespawn(Location location) {
-+        ServerPlayer serverPlayer = getHandle();
-+        serverPlayer.smoothWorldTeleport = true;
-+        teleport(location);
-+        serverPlayer.smoothWorldTeleport = false;
-+    }
-+    // Slice end
-+
-     @Override
-     public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cause) {
-         // Paper start - Teleport API

patches/server/0011-Allow-access-to-LightEngine.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 18 Apr 2023 07:52:19 -0500
+Date: Mon, 28 Feb 2022 08:56:44 -0600
 Subject: [PATCH] Allow access to LightEngine
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 65d947df910d60f478e7a449eb161e5105e2c0c9..e08b72010f22ce680e88f443782bdfe6a46285f9 100644
+index edc6235288f0843608dae4552e05915e4067cbf2..73548e5fa318b84e9299ccac02a326bea86a6b11 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -524,7 +524,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         return !ChunkMap.isChunkInRange(x1, z1, x2, z2, distance) ? false : !ChunkMap.isChunkInRange(x1 + 1, z1 + 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 - 1, z1 + 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 + 1, z1 - 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 - 1, z1 - 1, x2, z2, distance);
+@@ -644,7 +644,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         return !ChunkMap.isChunkInRange(x1, z1, x2, z2, distance) ? false : (!ChunkMap.isChunkInRange(x1 + 1, z1, x2, z2, distance) ? true : (!ChunkMap.isChunkInRange(x1, z1 + 1, x2, z2, distance) ? true : (!ChunkMap.isChunkInRange(x1 - 1, z1, x2, z2, distance) ? true : !ChunkMap.isChunkInRange(x1, z1 - 1, x2, z2, distance))));
      }
  
 -    protected ThreadedLevelLightEngine getLightEngine() {

patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:40:20 -0500
-Subject: [PATCH] Ignore durability changes for equipment updates
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e11d7283662834047b2ff81a2fd25a4263792deb..d0e49ae973a91344f3973dc6e00e7e6c649e87cb 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3127,7 +3127,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) {
--        return !ItemStack.matches(stack2, stack);
-+        return !ItemStack.isSame(stack2, stack);
-     }
- 
-     private void handleHandSwap(Map<EquipmentSlot, ItemStack> equipmentChanges) {

patches/server/0012-Disable-Azalea-generation.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:45:12 -0500
-Subject: [PATCH] Disable Azalea generation
-
-
-diff --git a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
-index 8f5178e934b5f9bc48beacd082e479fd9fb80fa6..d580238d733ba2dbbbbaa2659d1a7834c8cf7dac 100644
---- a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
-+++ b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
-@@ -161,7 +161,7 @@ public class BiomeDefaultFeatures {
-         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CAVE_VINES);
-         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_CLAY);
-         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_VEGETATION);
--        builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE);
-+//        builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE); // Slice
-         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.SPORE_BLOSSOM);
-         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CLASSIC_VINES);
-     }
-diff --git a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
-index 3d899e4dbb96f64279485bbd5b708df88ddbfe8f..89f33b92dc8cfa22d1e1edbda1a31179743979e8 100644
---- a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
-+++ b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
-@@ -110,7 +110,7 @@ public class CaveFeatures {
-         RandomizedIntStateProvider randomizedIntStateProvider = new RandomizedIntStateProvider(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.CAVE_VINES.defaultBlockState(), 4).add(Blocks.CAVE_VINES.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)), CaveVinesBlock.AGE, UniformInt.of(23, 25));
-         FeatureUtils.register(featureRegisterable, CAVE_VINE, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.<IntProvider>builder().add(UniformInt.of(0, 19), 2).add(UniformInt.of(0, 2), 3).add(UniformInt.of(0, 6), 10).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true));
-         FeatureUtils.register(featureRegisterable, CAVE_VINE_IN_MOSS, Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.<IntProvider>builder().add(UniformInt.of(0, 3), 5).add(UniformInt.of(1, 7), 1).build()), weightedStateProvider), BlockColumnConfiguration.layer(ConstantInt.of(1), randomizedIntStateProvider)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true));
--        FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10))));
-+        FeatureUtils.register(featureRegisterable, MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10))));
-         FeatureUtils.register(featureRegisterable, MOSS_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.8F, UniformInt.of(4, 7), 0.3F));
-         FeatureUtils.register(featureRegisterable, MOSS_PATCH_BONEMEAL, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(holderGetter.getOrThrow(MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F));
-         FeatureUtils.register(featureRegisterable, DRIPLEAF, Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(makeSmallDripleaf(), makeDripleaf(Direction.EAST), makeDripleaf(Direction.WEST), makeDripleaf(Direction.SOUTH), makeDripleaf(Direction.NORTH))));

patches/server/0012-Packet-obfuscation-and-reduction.patch

@@ -1,61 +1,74 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 6 Jun 2023 07:51:32 -0500
+Date: Mon, 28 Feb 2022 09:01:45 -0600
 Subject: [PATCH] Packet obfuscation and reduction
 
 
-diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-index 5dfb35117c285e0b202dc9c088ad5848beb8d054..b3d2cbf9f60c4a4b34df20bfe45a80ac23f4570f 100644
---- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-+++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-@@ -165,15 +165,29 @@ public class SynchedEntityData {
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
+index 3e17f6131bf590d7c4a16b79c1c145cb4f565bc9..e1233fa58d068448d0accef7a7f6725fcb902848 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEntityDataPacket.java
+@@ -22,6 +22,13 @@ public class ClientboundSetEntityDataPacket implements Packet<ClientGamePacketLi
+ 
      }
  
-     public <T> void set(EntityDataAccessor<T> key, T value, boolean force) {
 +    // Slice start
-+        this.set(key, value, force, null);
++    public ClientboundSetEntityDataPacket(int id, List<SynchedEntityData.DataItem<?>> packedItems) {
++        this.id = id;
++        this.packedItems = packedItems;
++    }
++    // Slice end
++
+     public ClientboundSetEntityDataPacket(FriendlyByteBuf buf) {
+         this.id = buf.readVarInt();
+         this.packedItems = SynchedEntityData.unpack(buf);
+diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
+index 1d88edfd09a909044f6e3175af652914b4d06311..e4f8403c6544e1a00571f28954458a1412a6de58 100644
+--- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
++++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
+@@ -136,6 +136,11 @@ public class SynchedEntityData {
+     }
+ 
+     public <T> void set(EntityDataAccessor<T> key, T value) {
++        //Slice start
++        set(key, value, null);
 +    }
 +
-+    public <T> void set(EntityDataAccessor<T> key, T value, @Nullable T foreignValue) {
-+        this.set(key, value, false, foreignValue);
-+    }
-+
-+    public <T> void set(EntityDataAccessor<T> key, T value, boolean force, @Nullable T foreignValue) { // Slice end
++    public <T> void set(EntityDataAccessor<T> key, T value, @Nullable T foreignValue) { // Slice end
          SynchedEntityData.DataItem<T> datawatcher_item = this.getItem(key);
  
+         if (ObjectUtils.notEqual(value, datawatcher_item.getValue())) {
+@@ -145,6 +150,11 @@ public class SynchedEntityData {
+             this.isDirty = true;
+         }
+ 
 +        // Slice start
 +        if (foreignValue != null && ObjectUtils.notEqual(foreignValue, datawatcher_item.getForeignValue())) {
 +            datawatcher_item.setForeignValue(foreignValue);
 +        }
 +        // Slice end
-+
-         if (force || ObjectUtils.notEqual(value, datawatcher_item.getValue())) {
-             datawatcher_item.setValue(value);
-             this.entity.onSyncedDataUpdated(key);
-             datawatcher_item.setDirty(true);
-             this.isDirty = true;
-         }
--
      }
  
      // CraftBukkit start - add method from above
-@@ -215,6 +229,26 @@ public class SynchedEntityData {
+@@ -200,6 +210,28 @@ public class SynchedEntityData {
          return list;
      }
  
 +    // Slice start
 +    @Nullable
-+    public List<SynchedEntityData.DataValue<?>> packForeignDirty() {
-+        List<SynchedEntityData.DataValue<?>> list = null;
++    public List<SynchedEntityData.DataItem<?>> packForeignDirty(List<DataItem<?>> unpackedData) {
++        List<SynchedEntityData.DataItem<?>> list = null;
++
++        for (DataItem<?> dataItem : unpackedData) {
++            DataItem<?> item = itemsById.get(dataItem.accessor.getId());
++            if (item.isDirty(true)) {
++                item.setForeignDirty(false);
 +
-+        for (DataItem<?> dataItem : this.itemsById.values()) {
-+            if (dataItem.isDirty(true)) {
-+                dataItem.setForeignDirty(false);
 +                if (list == null) {
-+                    list = new ArrayList();
++                    list = Lists.newArrayList();
 +                }
 +
-+                list.add(dataItem.foreignValue != null ? dataItem.foreignValue() : dataItem.value());
++                list.add(item.copy(true));
 +            }
 +        }
 +
@@ -64,33 +77,29 @@ index 5dfb35117c285e0b202dc9c088ad5848beb8d054..b3d2cbf9f60c4a4b34df20bfe45a80ac
 +    // Slice end
 +
      @Nullable
-     public List<SynchedEntityData.DataValue<?>> getNonDefaultValues() {
-         List<SynchedEntityData.DataValue<?>> list = null;
-@@ -336,11 +370,14 @@ public class SynchedEntityData {
+     public List<SynchedEntityData.DataItem<?>> getAll() {
+         List<SynchedEntityData.DataItem<?>> list = null;
+@@ -313,11 +345,14 @@ public class SynchedEntityData {
+         final EntityDataAccessor<T> accessor;
          T value;
-         private final T initialValue;
          private boolean dirty;
-+        private @Nullable T foreignValue = null; // Slice
++        @Nullable T foreignValue = null; // Slice
 +        private boolean foreignDirty; // Slice
  
          public DataItem(EntityDataAccessor<T> data, T value) {
              this.accessor = data;
-             this.initialValue = value;
              this.value = value;
-+            this.foreignDirty = true; //Slice
+             this.dirty = true;
++            this.foreignDirty = true; // Slice
          }
  
          public EntityDataAccessor<T> getAccessor() {
-@@ -370,6 +407,35 @@ public class SynchedEntityData {
-         public SynchedEntityData.DataValue<T> value() {
-             return SynchedEntityData.DataValue.create(this.accessor, this.value);
+@@ -343,5 +378,34 @@ public class SynchedEntityData {
+         public SynchedEntityData.DataItem<T> copy() {
+             return new SynchedEntityData.DataItem<>(this.accessor, this.accessor.getSerializer().copy(this.value));
          }
 +
 +        // Slice start
-+        public SynchedEntityData.DataValue<T> foreignValue() {
-+            return SynchedEntityData.DataValue.create(this.accessor, this.foreignValue);
-+        }
-+
 +        public void setForeignValue(T foreignValue) {
 +            this.foreignValue = foreignValue;
 +            this.foreignDirty = true;
@@ -113,41 +122,43 @@ index 5dfb35117c285e0b202dc9c088ad5848beb8d054..b3d2cbf9f60c4a4b34df20bfe45a80ac
 +        public void setForeignDirty(boolean dirty) {
 +            this.foreignDirty = dirty;
 +        }
++
++        public SynchedEntityData.DataItem<T> copy(boolean foreign) {
++            return new SynchedEntityData.DataItem<>(this.accessor, this.accessor.getSerializer().copy((foreign && this.foreignValue != null ? this.foreignValue : this.value)));
++        }
 +        // Slice end
      }
- 
-     public static record DataValue<T>(int id, EntityDataSerializer<T> serializer, T value) { // CraftBukkit - decompile error
+ }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 196280f54e397c69d32bd4d1f6ae666efdd93773..a514a1f26e439b5959093488ec9905fec327a404 100644
+index f91e1a876ad4c46a7c92cead18947a941b4d9e68..13973b8803afefd491dc05e1df6e9b10174e0108 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -381,7 +381,20 @@ public class ServerEntity {
+@@ -371,7 +371,19 @@ public class ServerEntity {
+         SynchedEntityData datawatcher = this.entity.getEntityData();
  
-         if (list != null) {
-             this.trackedDataValues = datawatcher.getNonDefaultValues();
--            this.broadcastAndSend(new ClientboundSetEntityDataPacket(this.entity.getId(), list));
-+//            this.broadcastAndSend(new ClientboundSetEntityDataPacket(this.entity.getId(), list));
+         if (datawatcher.isDirty()) {
+-            this.broadcastAndSend(new ClientboundSetEntityDataPacket(this.entity.getId(), datawatcher, false));
 +            // Slice start
-+            ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(this.entity.getId(), list);
++            ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(this.entity.getId(), datawatcher, false);
 +            if (this.entity instanceof ServerPlayer serverPlayer) {
 +                serverPlayer.connection.send(dataPacket);
 +            }
 +
 +            //Get the packedData that the original packet has, and then determine if any of those are changed in
 +            //the foreign version. If null, nothing to notify foreign trackers about.
-+            List<SynchedEntityData.DataValue<?>> dirtyItems = datawatcher.packForeignDirty();
++            List<SynchedEntityData.DataItem<?>> dirtyItems = datawatcher.packForeignDirty(dataPacket.getUnpackedData());
 +            if (dirtyItems != null) {
-+                this.broadcast.accept(new ClientboundSetEntityDataPacket(this.entity.getId(), dirtyItems));
++                this.broadcast(new ClientboundSetEntityDataPacket(this.entity.getId(), dirtyItems));
 +            }
 +            // Slice end
          }
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6d6baa82bb7a67c3f6de4bdb0987e4d1f68b6ec8..b23b6be85496d031b81b2d3abb9690322c340a80 100644
+index 7fcb2ecae7ec9a457e00a6a3ea1fb7b589360e02..75afbe3722d3e3ba7fe33f959ca40679c40b95dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3272,7 +3272,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2987,7 +2987,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }
@@ -156,24 +167,11 @@ index 6d6baa82bb7a67c3f6de4bdb0987e4d1f68b6ec8..b23b6be85496d031b81b2d3abb969032
          // CraftBukkit end
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d0e49ae973a91344f3973dc6e00e7e6c649e87cb..b7c9876eaff4365d136a9af20c1a5845b3094336 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3127,7 +3127,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     }
- 
-     public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) {
--        return !ItemStack.isSame(stack2, stack);
-+        return !ItemStack.isSameItem(stack2, stack);
-     }
- 
-     private void handleHandSwap(Map<EquipmentSlot, ItemStack> equipmentChanges) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 38e110a226aac27d86dfe89bc0e9ecaada6ff268..15515e871c89498ec936ab24871741f883f18a3b 100644
+index 0156525637f8aa2e4e639bc493d8617b5af4cc32..1c598a97ed78a744907ae310f3568c447aad0949 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -643,7 +643,7 @@ public abstract class Player extends LivingEntity {
+@@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity {
      public void increaseScore(int score) {
          int j = this.getScore();
  
@@ -183,10 +181,10 @@ index 38e110a226aac27d86dfe89bc0e9ecaada6ff268..15515e871c89498ec936ab24871741f8
  
      public void startAutoSpinAttack(int riptideTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0af1801085701437f06c9ecaf8864fe875e90509..48402f6be39ca1fe65453ca3ab3b995ad33051b0 100644
+index ce78e024244c14530270b8276e5b0fd853f0a110..df22a1407f3d1e93f0f1d50b5dbec3df12b106d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2593,7 +2593,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2196,7 +2196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.sendHealthUpdate();
              }
          }

patches/server/0013-Smooth-world-teleports.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 09:11:14 -0600
+Subject: [PATCH] Smooth world teleports
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 2f5e40437d1865a874c352999edd084226d4e47b..6e796cae90112c3b087aa12cf7d7899d1d9bcbc9 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -257,6 +257,7 @@ public class ServerPlayer extends Player {
+     public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
+     public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
+     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
++    public boolean smoothWorldTeleport; // Slice
+ 
+     public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
+         super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 95fe4240f3e1174ec36598f24d63f0073c13b376..d0ec7a195c3efd2dfdbec1396ebc7794358e74c5 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -948,12 +948,12 @@ public abstract class PlayerList {
+         }
+         // CraftBukkit start
+         LevelData worlddata = worldserver1.getLevelData();
+-        entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeRegistration(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
++        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeRegistration(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
+         entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetSendDistance())); // Spigot // Paper - replace old player chunk management
+         entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetTickViewDistance())); // Spigot // Paper - replace old player chunk management
+         entityplayer1.spawnIn(worldserver1);
+         entityplayer1.unsetRemoved();
+-        entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
++        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
+         entityplayer1.setShiftKeyDown(false);
+ 
+         // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());

patches/server/0014-Add-PlayerPreChunkLoadEvent.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:47:43 -0500
-Subject: [PATCH] Add PlayerPreChunkLoadEvent
-
-
-diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-index 924539d4ac50c70178ba220424ffacd6ff277c8b..f9b30f2904d06f2a7de6fa03287bc2e40e879e2d 100644
---- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-+++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-@@ -411,7 +411,7 @@ public class RegionizedPlayerChunkLoader {
-         private boolean canGenerateChunks = true;
- 
-         private final ArrayDeque<ChunkHolderManager.TicketOperation<?, ?>> delayedTicketOps = new ArrayDeque<>();
--        private final LongOpenHashSet sentChunks = new LongOpenHashSet();
-+        public final LongOpenHashSet sentChunks = new LongOpenHashSet(); // Slice -> public
- 
-         private static final byte CHUNK_TICKET_STAGE_NONE           = 0;
-         private static final byte CHUNK_TICKET_STAGE_LOADING        = 1;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 836bdbf4a4742f0cce0f9612d694db03305c7a00..fb79e3ee663709538d6e322fd8401564dcbbe5a7 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -530,6 +530,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return true;
-     }
- 
-+    @Override
-+    public it.unimi.dsi.fastutil.longs.LongOpenHashSet getSentChunks(Player p) {
-+        ServerPlayer craftPlayer = ((CraftPlayer) p).getHandle();
-+        return craftPlayer.chunkLoader.sentChunks;
-+    }
-+
-     @Override
-     public boolean isChunkInUse(int x, int z) {
-         return this.isChunkLoaded(x, z);

patches/server/0014-World-Instance-flag.patch

@@ -1,26 +1,26 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:37:05 -0500
-Subject: [PATCH] Add World Instance flag
+Date: Mon, 28 Feb 2022 09:17:28 -0600
+Subject: [PATCH] World Instance flag
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 18aac3da3c88f33b1a71a5920a8daa27e9723913..af0720fb8bd334aac5493121c6373d87421204b4 100644
+index 98209532ad3e692d7e459640123f78bbd9a65889..9b3af8f2a433368d722cd442c07b2a2cfb16dc54 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
      public boolean hasEntityMoveEvent = false; // Paper
 +    public boolean instance; // Slice
      private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
      public static Throwable getAddToWorldStackTrace(Entity entity) {
-         final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
+         return new Throwable(entity + " Added to world at " + new java.util.Date());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1a481fb4f4228f0fea8a7dc6132248c98b727c90..836bdbf4a4742f0cce0f9612d694db03305c7a00 100644
+index 15d740a605c7257bcc7117c7dfb3612b472ba664..9d400d82eeab062322acea81b87f6fc572151700 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1268,6 +1268,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1280,6 +1280,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          world.noSave = !value;
      }
  
@@ -38,4 +38,4 @@ index 1a481fb4f4228f0fea8a7dc6132248c98b727c90..836bdbf4a4742f0cce0f9612d694db03
 +
      @Override
      public void setDifficulty(Difficulty difficulty) {
-         this.getHandle().getServer().setDifficulty(this.getHandle(), net.minecraft.world.Difficulty.byId(difficulty.getValue()), true); // Paper - don't skip other difficulty-changing logic
+         this.getHandle().serverLevelData.setDifficulty(net.minecraft.world.Difficulty.byId(difficulty.getValue()));

patches/server/0015-Add-PlayerTrackEntityEvent.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 28 Feb 2022 09:33:53 -0600
+Subject: [PATCH] Add PlayerTrackEntityEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index e4ba278cf42c4a946ddd3e1fefd07ae3b696cdc0..a0e84c988021c99309495d27f455e9c74c8b1053 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -365,6 +365,7 @@ public class ServerEntity {
+             }
+         }
+ 
++        this.entity.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerTrackEntityEvent(entityplayer.getBukkitEntity().getPlayer(), this.entity.getBukkitEntity())); // Slice
+     }
+ 
+     private void sendDirtyEntityData() {

patches/server/0016-Add-player-data-saving-events.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tom <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:38:40 -0500
-Subject: [PATCH] Add PlayerData Events
+Date: Mon, 28 Feb 2022 09:36:31 -0600
+Subject: [PATCH] Add player data saving events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index df2a4449bdc00eb936bf219807d401fc99663926..939d29db3c535c45866fe67cabbe9304601230b0 100644
+index a33431984b6051efd39f0077c55186da789d1d60..6df88cd4a86a85c0f4abd8fd50f576081b822925 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -602,6 +602,8 @@ public class ServerPlayerGameMode {
-                     enuminteractionresult1 = stack.useOn(itemactioncontext);
+@@ -627,6 +627,8 @@ public class ServerPlayerGameMode {
+                     enuminteractionresult1 = stack.useOn(itemactioncontext, hand);
                  }
  
 +                world.pendingPlayerBlockEvents.remove(blockposition); // Paper
@@ -18,10 +18,10 @@ index df2a4449bdc00eb936bf219807d401fc99663926..939d29db3c535c45866fe67cabbe9304
                      CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockposition, itemstack1);
                  }
 diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index 9501e5f25f5c4d3069e554d4dc82b0e094156682..8afd9b785fb8734255e3ea926b8375bb9cae60be 100644
+index c59f98ca3adfdd90cdc5999aeadbb0834efedc0f..6e819bd376eb9edee6bf8bd8c08a755599f1514a 100644
 --- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
 +++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -198,7 +198,12 @@ public class ServerStatsCounter extends StatsCounter {
+@@ -201,7 +201,12 @@ public class ServerStatsCounter extends StatsCounter {
          return nbttagcompound;
      }
  
@@ -35,17 +35,17 @@ index 9501e5f25f5c4d3069e554d4dc82b0e094156682..8afd9b785fb8734255e3ea926b8375bb
          Map<StatType<?>, JsonObject> map = Maps.newHashMap();
          ObjectIterator objectiterator = this.stats.object2IntEntrySet().iterator();
  
-@@ -224,7 +229,7 @@ public class ServerStatsCounter extends StatsCounter {
+@@ -227,7 +232,7 @@ public class ServerStatsCounter extends StatsCounter {
  
          jsonobject1.add("stats", jsonobject);
-         jsonobject1.addProperty("DataVersion", SharedConstants.getCurrentVersion().getDataVersion().getVersion());
+         jsonobject1.addProperty("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion());
 -        return jsonobject1.toString();
 +        return jsonobject1; // Slice
      }
  
      private static <T> ResourceLocation getKey(Stat<T> stat) {
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 36af81f0957d17e170d229059c66f4eb4539dfeb..e8d324a32838b69255ce48b1c03e47cd9e201da6 100644
+index 601f8099f74e81c17600566b3c9b7a6dd39c9bcb..cde84f45b67b88ecc410cdff924170b5b5366823 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -33,6 +33,7 @@ public class PlayerDataStorage {

patches/server/0017-Disable-geode-generation.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 18 Apr 2023 07:56:32 -0500
-Subject: [PATCH] Disable geode and monsterspawners generation
+Date: Mon, 28 Feb 2022 11:21:07 -0600
+Subject: [PATCH] Disable geode generation
 
 
 diff --git a/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
-index 84aa56cbcaa5539b556f42eb284d3dd2e200e358..a6d2ead225841192c2eb80b3b2e54ceeaa76546b 100644
+index 7cf6d6a055f40fd9e05aadc680ce6f703b808653..317bf4d6557426dc3bc1485db6969d74544d73eb 100644
 --- a/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
 +++ b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
-@@ -54,8 +54,8 @@ public class OverworldBiomes {
+@@ -41,8 +41,8 @@ public class OverworldBiomes {
  
      private static void globalOverworldGeneration(BiomeGenerationSettings.Builder generationSettings) {
          BiomeDefaultFeatures.addDefaultCarversAndLakes(generationSettings);

patches/server/0018-Make-getBiomeCategory-public.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Fri, 4 Mar 2022 09:16:03 -0600
+Subject: [PATCH] Make getBiomeCategory public
+
+
+diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
+index 32fc9f9162aafe312ed757be2d03577b5f95841d..19c36424dae6d6683b5b547025bbeb637e92e73d 100644
+--- a/src/main/java/net/minecraft/world/level/biome/Biome.java
++++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
+@@ -265,7 +265,7 @@ public final class Biome {
+         return this.specialEffects.getBackgroundMusic();
+     }
+ 
+-    Biome.BiomeCategory getBiomeCategory() {
++    public Biome.BiomeCategory getBiomeCategory() { // Slice
+         return this.biomeCategory;
+     }
+ 

patches/server/0019-Disable-Azalea-generation.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Tue, 15 Mar 2022 16:29:29 -0500
+Subject: [PATCH] Disable Azalea generation
+
+
+diff --git a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
+index 8609ad84a64c5ecbeef1746942cf7dcffdd2ef86..eae556c5c120971c93ff633c77e86ae0c7594268 100644
+--- a/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
++++ b/src/main/java/net/minecraft/data/worldgen/BiomeDefaultFeatures.java
+@@ -151,7 +151,7 @@ public class BiomeDefaultFeatures {
+         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CAVE_VINES);
+         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_CLAY);
+         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.LUSH_CAVES_VEGETATION);
+-        builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE);
++//        builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.ROOTED_AZALEA_TREE); // Slice
+         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.SPORE_BLOSSOM);
+         builder.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, CavePlacements.CLASSIC_VINES);
+     }
+diff --git a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
+index 34b67673fe1616f0c9990f62e311241bc62036e4..6e5ee21aa5e5c72d66b25c1287ce1e0c155003b2 100644
+--- a/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
++++ b/src/main/java/net/minecraft/data/worldgen/features/CaveFeatures.java
+@@ -66,7 +66,7 @@ public class CaveFeatures {
+     private static final RandomizedIntStateProvider CAVE_VINES_HEAD_PROVIDER = new RandomizedIntStateProvider(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.CAVE_VINES.defaultBlockState(), 4).add(Blocks.CAVE_VINES.defaultBlockState().setValue(CaveVines.BERRIES, Boolean.valueOf(true)), 1)), CaveVinesBlock.AGE, UniformInt.of(23, 25));
+     public static final Holder<ConfiguredFeature<BlockColumnConfiguration, ?>> CAVE_VINE = FeatureUtils.register("cave_vine", Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.<IntProvider>builder().add(UniformInt.of(0, 19), 2).add(UniformInt.of(0, 2), 3).add(UniformInt.of(0, 6), 10).build()), CAVE_VINES_BODY_PROVIDER), BlockColumnConfiguration.layer(ConstantInt.of(1), CAVE_VINES_HEAD_PROVIDER)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true));
+     public static final Holder<ConfiguredFeature<BlockColumnConfiguration, ?>> CAVE_VINE_IN_MOSS = FeatureUtils.register("cave_vine_in_moss", Feature.BLOCK_COLUMN, new BlockColumnConfiguration(List.of(BlockColumnConfiguration.layer(new WeightedListInt(SimpleWeightedRandomList.<IntProvider>builder().add(UniformInt.of(0, 3), 5).add(UniformInt.of(1, 7), 1).build()), CAVE_VINES_BODY_PROVIDER), BlockColumnConfiguration.layer(ConstantInt.of(1), CAVE_VINES_HEAD_PROVIDER)), Direction.DOWN, BlockPredicate.ONLY_IN_AIR_PREDICATE, true));
+-    public static final Holder<ConfiguredFeature<SimpleBlockConfiguration, ?>> MOSS_VEGETATION = FeatureUtils.register("moss_vegetation", Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.FLOWERING_AZALEA.defaultBlockState(), 4).add(Blocks.AZALEA.defaultBlockState(), 7).add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10))));
++    public static final Holder<ConfiguredFeature<SimpleBlockConfiguration, ?>> MOSS_VEGETATION = FeatureUtils.register("moss_vegetation", Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder().add(Blocks.MOSS_CARPET.defaultBlockState(), 25).add(Blocks.GRASS.defaultBlockState(), 50).add(Blocks.TALL_GRASS.defaultBlockState(), 10))));
+     public static final Holder<ConfiguredFeature<VegetationPatchConfiguration, ?>> MOSS_PATCH = FeatureUtils.register("moss_patch", Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(MOSS_VEGETATION), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.8F, UniformInt.of(4, 7), 0.3F));
+     public static final Holder<ConfiguredFeature<VegetationPatchConfiguration, ?>> MOSS_PATCH_BONEMEAL = FeatureUtils.register("moss_patch_bonemeal", Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(Blocks.MOSS_BLOCK), PlacementUtils.inlinePlaced(MOSS_VEGETATION), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F));
+     public static final Holder<ConfiguredFeature<SimpleRandomFeatureConfiguration, ?>> DRIPLEAF = FeatureUtils.register("dripleaf", Feature.SIMPLE_RANDOM_SELECTOR, new SimpleRandomFeatureConfiguration(HolderSet.direct(makeSmallDripleaf(), makeDripleaf(Direction.EAST), makeDripleaf(Direction.WEST), makeDripleaf(Direction.SOUTH), makeDripleaf(Direction.NORTH))));

patches/server/0020-PlayerLoadStatsEvent.patch

@@ -1,145 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:15:23 -0500
-Subject: [PATCH] PlayerLoadStatsEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 97c6f1c622af02b3761b23a4d3a67b385e45ea84..7f059a71d25170e8e3215c7d91ab7927394cfeb5 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1474,7 +1474,7 @@ public abstract class PlayerList {
-                 }
-             }
- 
--            serverstatisticmanager = new ServerStatsCounter(this.server, file1);
-+            serverstatisticmanager = new ServerStatsCounter(this.server, file1, uuid); // Slice
-             // this.stats.put(uuid, serverstatisticmanager); // CraftBukkit
-         }
- 
-diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index 8afd9b785fb8734255e3ea926b8375bb9cae60be..9bd42eac43f068df8f7f49249bb47840d87d799a 100644
---- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -45,7 +45,7 @@ public class ServerStatsCounter extends StatsCounter {
-     private final File file;
-     private final Set<Stat<?>> dirty = Sets.newHashSet();
- 
--    public ServerStatsCounter(MinecraftServer server, File file) {
-+    public ServerStatsCounter(MinecraftServer server, File file, java.util.UUID uuid) { // Slice
-         this.server = server;
-         this.file = file;
-         // Spigot start
-@@ -55,7 +55,13 @@ public class ServerStatsCounter extends StatsCounter {
-             this.stats.put( wrapper, entry.getValue().intValue() );
-         }
-         // Spigot end
--        if (file.isFile()) {
-+        // Slice start - If event supplies stats, use it. Otherwise just load from disk as usual
-+        com.destroystokyo.paper.event.player.PlayerLoadStatsEvent event = new com.destroystokyo.paper.event.player.PlayerLoadStatsEvent(uuid);
-+        org.bukkit.Bukkit.getPluginManager().callEvent(event);
-+        JsonObject providedStats = event.getStatistics();
-+        if (providedStats != null) {
-+            readStats(server.getFixerUpper(), fromJson(providedStats));
-+        } else if (file.isFile()) { // Slice end
-             try {
-                 this.parseLocal(server.getFixerUpper(), FileUtils.readFileToString(file));
-             } catch (IOException ioexception) {
-@@ -103,46 +109,8 @@ public class ServerStatsCounter extends StatsCounter {
- 
-                     if (!jsonelement.isJsonNull()) {
-                         CompoundTag nbttagcompound = ServerStatsCounter.fromJson(jsonelement.getAsJsonObject());
--
--                        nbttagcompound = DataFixTypes.STATS.updateToCurrentVersion(dataFixer, nbttagcompound, NbtUtils.getDataVersion(nbttagcompound, 1343));
--                        if (!nbttagcompound.contains("stats", 10)) {
--                            break label48;
--                        }
--
--                        CompoundTag nbttagcompound1 = nbttagcompound.getCompound("stats");
--                        Iterator iterator = nbttagcompound1.getAllKeys().iterator();
--
--                        while (true) {
--                            if (!iterator.hasNext()) {
--                                break label48;
--                            }
--
--                            String s1 = (String) iterator.next();
--
--                            if (nbttagcompound1.contains(s1, 10)) {
--                                Util.ifElse(BuiltInRegistries.STAT_TYPE.getOptional(new ResourceLocation(s1)), (statisticwrapper) -> {
--                                    CompoundTag nbttagcompound2 = nbttagcompound1.getCompound(s1);
--                                    Iterator iterator1 = nbttagcompound2.getAllKeys().iterator();
--
--                                    while (iterator1.hasNext()) {
--                                        String s2 = (String) iterator1.next();
--
--                                        if (nbttagcompound2.contains(s2, 99)) {
--                                            Util.ifElse(this.getStat(statisticwrapper, s2), (statistic) -> {
--                                                this.stats.put(statistic, nbttagcompound2.getInt(s2));
--                                            }, () -> {
--                                                ServerStatsCounter.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.file, s2);
--                                            });
--                                        } else {
--                                            ServerStatsCounter.LOGGER.warn("Invalid statistic value in {}: Don't know what {} is for key {}", new Object[]{this.file, nbttagcompound2.get(s2), s2});
--                                        }
--                                    }
--
--                                }, () -> {
--                                    ServerStatsCounter.LOGGER.warn("Invalid statistic type in {}: Don't know what {} is", this.file, s1);
--                                });
--                            }
--                        }
-+                        readStats(dataFixer, nbttagcompound);
-+                        break label48;
-                     }
- 
-                     ServerStatsCounter.LOGGER.error("Unable to parse Stat data from {}", this.file);
-@@ -167,6 +135,48 @@ public class ServerStatsCounter extends StatsCounter {
- 
-     }
- 
-+    private void readStats(DataFixer dataFixer, CompoundTag nbttagcompound) {
-+        nbttagcompound = DataFixTypes.STATS.updateToCurrentVersion(dataFixer, nbttagcompound, NbtUtils.getDataVersion(nbttagcompound, 1343));
-+        if (!nbttagcompound.contains("stats", 10)) {
-+            return;
-+        }
-+
-+        CompoundTag nbttagcompound1 = nbttagcompound.getCompound("stats");
-+        Iterator iterator = nbttagcompound1.getAllKeys().iterator();
-+
-+        while (true) {
-+            if (!iterator.hasNext()) {
-+                return;
-+            }
-+
-+            String s1 = (String) iterator.next();
-+
-+            if (nbttagcompound1.contains(s1, 10)) {
-+                Util.ifElse(BuiltInRegistries.STAT_TYPE.getOptional(new ResourceLocation(s1)), (statisticwrapper) -> {
-+                    CompoundTag nbttagcompound2 = nbttagcompound1.getCompound(s1);
-+                    Iterator iterator1 = nbttagcompound2.getAllKeys().iterator();
-+
-+                    while (iterator1.hasNext()) {
-+                        String s2 = (String) iterator1.next();
-+
-+                        if (nbttagcompound2.contains(s2, 99)) {
-+                            Util.ifElse(this.getStat(statisticwrapper, s2), (statistic) -> {
-+                                this.stats.put(statistic, nbttagcompound2.getInt(s2));
-+                            }, () -> {
-+                                ServerStatsCounter.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.file, s2);
-+                            });
-+                        } else {
-+                            ServerStatsCounter.LOGGER.warn("Invalid statistic value in {}: Don't know what {} is for key {}", new Object[]{this.file, nbttagcompound2.get(s2), s2});
-+                        }
-+                    }
-+
-+                }, () -> {
-+                    ServerStatsCounter.LOGGER.warn("Invalid statistic type in {}: Don't know what {} is", this.file, s1);
-+                });
-+            }
-+        }
-+    }
-+
-     private <T> Optional<Stat<T>> getStat(StatType<T> type, String id) {
-         // CraftBukkit - decompile error start
-         Optional<ResourceLocation> optional = Optional.ofNullable(ResourceLocation.tryParse(id));

patches/server/0020-Set-Mutton-nutrition-equal-to-Beef-Porkchop.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Tue, 18 Apr 2023 07:58:01 -0500
-Subject: [PATCH] Set Mutton nutrition equal to beef
+Date: Thu, 31 Mar 2022 09:06:19 -0500
+Subject: [PATCH] Set Mutton nutrition equal to Beef/Porkchop
 
 
 diff --git a/src/main/java/net/minecraft/world/food/Foods.java b/src/main/java/net/minecraft/world/food/Foods.java

patches/server/0021-Add-Force-Crit-to-PlayerPreAttackEntityEvent.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:16:50 -0500
-Subject: [PATCH] Add Force Crit to PlayerPreAttackEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 58152160d609d0e9d105153aeb166a56a7955603..5d52d8821edc8dd2cac3391081a223811297faf8 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1277,10 +1277,11 @@ public abstract class Player extends LivingEntity {
-                         flag1 = true;
-                     }
- 
--                    boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround() && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity; // Paper - Add critical damage API - conflict on change
-+                    boolean forceCrit = playerAttackEntityEvent.isForceCrit();
-+                    boolean flag2 = forceCrit || (flag && this.fallDistance > 0.0F && !this.onGround() && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity); // Paper - Add critical damage API - conflict on change // Slice
- 
--                    flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper
--                    flag2 = flag2 && !this.isSprinting();
-+                    flag2 = flag2 && !level().paperConfig().entities.behavior.disablePlayerCrits; // Paper
-+                    flag2 = forceCrit || (flag2 && !this.isSprinting()); // Slice
-                     if (flag2) {
-                         f *= 1.5F;
-                     }
-@@ -2411,27 +2412,6 @@ public abstract class Player extends LivingEntity {
-         this.lastDeathLocation = lastDeathPos;
-     }
- 
--    @Override
--    public float getHurtDir() {
--        return this.hurtDir;
--    }
--
--    @Override
--    public void animateHurt(float yaw) {
--        super.animateHurt(yaw);
--        this.hurtDir = yaw;
--    }
--
--    @Override
--    public boolean canSprint() {
--        return true;
--    }
--
--    @Override
--    protected float getFlyingSpeed() {
--        return this.abilities.flying && !this.isPassenger() ? (this.isSprinting() ? this.abilities.getFlyingSpeed() * 2.0F : this.abilities.getFlyingSpeed()) : (this.isSprinting() ? 0.025999999F : 0.02F);
--    }
--
-     public static enum BedSleepingProblem {
- 
-         NOT_POSSIBLE_HERE, NOT_POSSIBLE_NOW(Component.translatable("block.minecraft.bed.no_sleep")), TOO_FAR_AWAY(Component.translatable("block.minecraft.bed.too_far_away")), OBSTRUCTED(Component.translatable("block.minecraft.bed.obstructed")), OTHER_PROBLEM, NOT_SAFE(Component.translatable("block.minecraft.bed.not_safe"));

patches/server/0021-Debug-sync-chunk-loads.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Sat, 2 Apr 2022 17:38:32 -0500
+Subject: [PATCH] Debug sync chunk loads
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+index d0c55497040158d959693ef2ddf3ff03bd6df05f..5925feafad214333529bace2178f233f589e1a6e 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
++++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
+@@ -70,7 +70,7 @@ import java.util.stream.Collectors;
+ 
+ public class PaperCommand extends Command {
+     private static final String BASE_PERM = "bukkit.command.paper.";
+-    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo", "dumpitem", "mobcaps", "playermobcaps").build();
++    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "fixlight", "syncloadinfo", "dumpitem", "mobcaps", "playermobcaps", "debugsyncload").build(); // Slice
+ 
+     public PaperCommand(String name) {
+         super(name);
+@@ -203,6 +203,12 @@ public class PaperCommand extends Command {
+             case "syncloadinfo":
+                 this.doSyncLoadInfo(sender, args);
+                 break;
++            // Slice start
++            case "debugsyncload":
++                SyncLoadFinder.DEBUG = !SyncLoadFinder.DEBUG;
++                MinecraftServer.LOGGER.info("Debugging sync chunk loads now " + (SyncLoadFinder.DEBUG ? "ON" : "OFF"));
++                break;
++            // Slice end
+             case "mobcaps":
+                 this.printMobcaps(sender, args);
+                 break;
+diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
+index d3e619655382e50e9ac9323ed942502d85c9599c..a0c4db2a78895a3e76dea755c157eccabdbf04f8 100644
+--- a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
++++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
+@@ -17,6 +17,8 @@ public class SyncLoadFinder {
+ 
+     public static final boolean ENABLED = Boolean.getBoolean("paper.debug-sync-loads");
+ 
++    public static boolean DEBUG = ENABLED; // Slice
++
+     private static final WeakHashMap<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> SYNC_LOADS = new WeakHashMap<>();
+ 
+     private static final class SyncLoadInformation {
+@@ -31,6 +33,13 @@ public class SyncLoadFinder {
+     }
+ 
+     public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) {
++        // Slice start
++        if (DEBUG) {
++            org.bukkit.Bukkit.getServer().getLogger().log(java.util.logging.Level.WARNING, "Sync chunk load at " + world.getWorld().getName() + " (" + chunkX + "," + chunkZ + ")");
++            Thread.dumpStack();
++        }
++        // Slice end
++
+         if (!ENABLED) {
+             return;
+         }

patches/server/0022-Add-PlayerGetRespawnLocationEvent.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:46:18 -0500
+Date: Sun, 3 Apr 2022 08:28:24 -0500
 Subject: [PATCH] Add PlayerGetRespawnLocationEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f097ec5b4e3ad6b1a7c464a8cff4f8b2568fcf4f..20a0b9835c47ca153a6f77dacf4b775de32e4ef2 100644
+index d0ec7a195c3efd2dfdbec1396ebc7794358e74c5..8cef43d4ffbdbf96380a274d80045405b5cff780 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -853,49 +853,57 @@ public abstract class PlayerList {
+@@ -876,49 +876,57 @@ public abstract class PlayerList {
  
          // CraftBukkit start - fire PlayerRespawnEvent
          if (location == null) {
@@ -67,20 +67,20 @@ index f097ec5b4e3ad6b1a7c464a8cff4f8b2568fcf4f..20a0b9835c47ca153a6f77dacf4b775d
 +                            f1 = (float) Mth.wrapDegrees(Mth.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D);
 +                        }
  
--                    // entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false); // CraftBukkit - not required, just copies old location into reused entity
+-                    entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // Paper - PlayerSetSpawnEvent
 -                    flag2 = !flag && flag3;
 -                    isBedSpawn = true;
--                    location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
+-                    location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
 -                } else if (blockposition != null) {
 -                    entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 -                    entityplayer1.setRespawnPosition(null, null, 0f, false, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - PlayerSetSpawnEvent
-+                        // entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false); // CraftBukkit - not required, just copies old location into reused entity
++                        entityplayer1.setRespawnPosition(worldserver1.dimension(), blockposition, f, flag1, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // Paper - PlayerSetSpawnEvent
 +                        flag2 = !flag && flag3;
 +                        isBedSpawn = true;
-+                        location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
++                        location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
 +                    } else if (blockposition != null) {
 +                        entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
-+                        entityplayer1.setRespawnPosition(null, null, 0f, false, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - PlayerSetSpawnEvent
++                        entityplayer1.setRespawnPosition(null, null, 0f, false, false); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - PlayerSetSpawnEvent
 +                    }
                  }
 -            }
@@ -88,15 +88,15 @@ index f097ec5b4e3ad6b1a7c464a8cff4f8b2568fcf4f..20a0b9835c47ca153a6f77dacf4b775d
 -            if (location == null) {
 -                worldserver1 = this.server.getLevel(Level.OVERWORLD);
 -                blockposition = entityplayer1.getSpawnPoint(worldserver1);
--                location = CraftLocation.toBukkit(blockposition, worldserver1.getWorld(), worldserver1.levelData.getSpawnAngle(), 0.0F).add(0.5F, 0.1F, 0.5F); // Paper - use world spawn angle
+-                location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F), worldserver1.levelData.getSpawnAngle(), 0.0F); // Paper - use world spawn angle
 +                if (location == null) {
 +                    worldserver1 = this.server.getLevel(Level.OVERWORLD);
 +                    blockposition = entityplayer1.getSpawnPoint(worldserver1);
-+                    location = CraftLocation.toBukkit(blockposition, worldserver1.getWorld(), worldserver1.levelData.getSpawnAngle(), 0.0F).add(0.5F, 0.1F, 0.5F); // Paper - use world spawn angle
++                    location = new Location(worldserver1.getWorld(), (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.1F), (double) ((float) blockposition.getZ() + 0.5F), worldserver1.levelData.getSpawnAngle(), 0.0F); // Paper - use world spawn angle
 +                }
              }
  
 -            Player respawnPlayer = entityplayer1.getBukkitEntity();
-             PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
+             PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
              this.cserver.getPluginManager().callEvent(respawnEvent);
              // Spigot Start

patches/server/0022-Add-Preventing-KB-Bonus-to-PlayerPreAttackEntityEven.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:17:39 -0500
-Subject: [PATCH] Add Preventing KB Bonus to PlayerPreAttackEntityEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5d52d8821edc8dd2cac3391081a223811297faf8..38e110a226aac27d86dfe89bc0e9ecaada6ff268 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1269,7 +1269,11 @@ public abstract class Player extends LivingEntity {
-                     boolean flag = f2 > 0.9F;
-                     boolean flag1 = false;
-                     byte b0 = 0;
--                    int i = b0 + EnchantmentHelper.getKnockbackBonus(this);
-+                    int i = b0; // Slice start
-+                    if (!playerAttackEntityEvent.isPreventKnockbackBonus()) {
-+                        i += EnchantmentHelper.getKnockbackBonus(this);
-+                    }
-+                    // Slice end
- 
-                     if (this.isSprinting() && flag) {
-                         sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_KNOCKBACK, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility

patches/server/0023-Set-multiple-Team-settings-with-a-single-packet.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 07:52:53 -0500
-Subject: [PATCH] Set multiple team settings at once
+Date: Thu, 7 Apr 2022 16:35:36 -0500
+Subject: [PATCH] Set multiple Team settings with a single packet
 
 
 diff --git a/src/main/java/net/minecraft/world/scores/PlayerTeam.java b/src/main/java/net/minecraft/world/scores/PlayerTeam.java
-index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca501c10d7e6 100644
+index defff79eb28adc52851fa781d4d4a7745a884bdc..fb48bfbce1bca47d71a0ed35af1b1296529fa2bd 100644
 --- a/src/main/java/net/minecraft/world/scores/PlayerTeam.java
 +++ b/src/main/java/net/minecraft/world/scores/PlayerTeam.java
 @@ -28,6 +28,7 @@ public class PlayerTeam extends Team {
@@ -17,7 +17,7 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50
      public PlayerTeam(Scoreboard scoreboard, String name) {
          this.scoreboard = scoreboard;
 @@ -36,6 +37,12 @@ public class PlayerTeam extends Team {
-         this.displayNameStyle = Style.EMPTY.withInsertion(name).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.literal(name)));
+         this.displayNameStyle = Style.EMPTY.withInsertion(name).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent(name)));
      }
  
 +    // Slice start
@@ -39,7 +39,7 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50
      }
  
      public void setPlayerPrefix(@Nullable Component prefix) {
-         this.playerPrefix = prefix == null ? CommonComponents.EMPTY : prefix;
+         this.playerPrefix = prefix == null ? TextComponent.EMPTY : prefix;
 -        this.scoreboard.onTeamChanged(this);
 +        if (updateTeamChangeInstantly) this.scoreboard.onTeamChanged(this); // Slice
      }
@@ -48,7 +48,7 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50
 @@ -79,7 +86,7 @@ public class PlayerTeam extends Team {
  
      public void setPlayerSuffix(@Nullable Component suffix) {
-         this.playerSuffix = suffix == null ? CommonComponents.EMPTY : suffix;
+         this.playerSuffix = suffix == null ? TextComponent.EMPTY : suffix;
 -        this.scoreboard.onTeamChanged(this);
 +        if (updateTeamChangeInstantly) this.scoreboard.onTeamChanged(this); // Slice
      }
@@ -106,10 +106,10 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 9c3520524cfb903da6a5401760394ec1b49a1825..a6809c3104d4a8fce89eb5056b445ae0517bf9a0 100644
+index 67efb0d38ae369ff5254f7b1ec85d32d4eee8291..e4110e3a60242b958c9983a090b28aae540b2bdf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -341,6 +341,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -347,6 +347,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
          }
      }
  

patches/server/0023-noEntityCollisions-for-Entity.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 08:21:03 -0500
-Subject: [PATCH] noEntityCollisions for Entity
-
-
-diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java
-index a87f6380b2c387fb0cdd40d5087b5c93492e3c88..cd35c2136a638c07fed683a2f92e70aa57bcfa8e 100644
---- a/src/main/java/io/papermc/paper/util/CollisionUtil.java
-+++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java
-@@ -809,7 +809,7 @@ public final class CollisionUtil {
- 
-     public static boolean getEntityHardCollisions(final CollisionGetter getter, final Entity entity, AABB aabb,
-                                                   final List<AABB> into, final boolean checkOnly, final Predicate<Entity> predicate) {
--        if (isEmpty(aabb) || !(getter instanceof EntityGetter entityGetter)) {
-+        if ((entity != null && entity.noEntityCollisions) || isEmpty(aabb) || !(getter instanceof EntityGetter entityGetter)) { // Slice
-             return false;
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0f8740c93fe86d4c49b9e43f1044ef03d8e3de7..6d6baa82bb7a67c3f6de4bdb0987e4d1f68b6ec8 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -453,6 +453,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-      * Overriding this field will cause memory leaks.
-      */
-     private final boolean hardCollides;
-+    public boolean noEntityCollisions; // Slice
- 
-     private static final java.util.Map<Class<? extends Entity>, Boolean> cachedOverrides = java.util.Collections.synchronizedMap(new java.util.WeakHashMap<>());
-     {

patches/server/0024-Do-not-freeze-MappedRegistry.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 25 Apr 2023 09:05:16 -0500
-Subject: [PATCH] Do not freeze MappedRegistry
-
-
-diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
-index 1e33434f9f361542e03da3e4812bc6d76768a202..828d9472bf90fe098825c15bc55949497a40ae39 100644
---- a/src/main/java/net/minecraft/core/MappedRegistry.java
-+++ b/src/main/java/net/minecraft/core/MappedRegistry.java
-@@ -338,7 +338,7 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
-         if (this.frozen) {
-             return this;
-         } else {
--            this.frozen = true;
-+//            this.frozen = true; // Slice
-             this.byValue.forEach((value, entry) -> {
-                 entry.bindValue(value);
-             });
-@@ -365,14 +365,16 @@ public class MappedRegistry<T> implements WritableRegistry<T> {
- 
-     @Override
-     public Holder.Reference<T> createIntrusiveHolder(T value) {
-+        // Slice start
-         if (this.unregisteredIntrusiveHolders == null) {
--            throw new IllegalStateException("This registry can't create intrusive holders");
--        } else {
--            this.validateWrite();
--            return this.unregisteredIntrusiveHolders.computeIfAbsent(value, (valuex) -> {
--                return Holder.Reference.createIntrusive(this.asLookup(), valuex);
--            });
-+            this.unregisteredIntrusiveHolders = new HashMap<>();
-         }
-+        // Slice end
-+
-+        this.validateWrite();
-+        return this.unregisteredIntrusiveHolders.computeIfAbsent(value, (valuex) -> {
-+            return Holder.Reference.createIntrusive(this.asLookup(), valuex);
-+        });
-     }
- 
-     @Override

patches/server/0024-Unfreeze-MappedRegistry.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Wed, 7 Sep 2022 17:37:47 -0500
+Subject: [PATCH] Unfreeze MappedRegistry
+
+
+diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java
+index c3c0e52cfe8ef5fe9049c4582778040702131b47..c37676f6c70fcf21fc6e3b7322f9d73c4c128c06 100644
+--- a/src/main/java/net/minecraft/core/MappedRegistry.java
++++ b/src/main/java/net/minecraft/core/MappedRegistry.java
+@@ -306,6 +306,8 @@ public class MappedRegistry<T> extends WritableRegistry<T> {
+ 
+     @Override
+     public Registry<T> freeze() {
++        if (true) return this; // Slice (a TODO in Paper, thanks Owen)
++
+         this.frozen = true;
+         List<ResourceLocation> list = this.byKey.entrySet().stream().filter((entry) -> {
+             return !entry.getValue().isBound();

patches/server/0025-Add-jackson.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 2 May 2023 07:54:02 -0500
-Subject: [PATCH] Add jackson
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 2e1cea360bb6ff85eb8da54237bc407653eb91f6..475cbb6120655419fc7dc51292e6beedfe778656 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -19,6 +19,13 @@ dependencies {
-         exclude("io.papermc.paper", "paper-api")
-     }
-     // Slice end
-+
-+    // Slice start - JSON logging for DataDog ingestion
-+    implementation("com.fasterxml.jackson.core:jackson-core:2.13.0")
-+    implementation("com.fasterxml.jackson.core:jackson-databind:2.13.0")
-+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.0")
-+    // Slice end
-+
-     // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.3.0")

patches/server/0025-Equipment-Packet-Caching.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 12 Jun 2023 14:14:48 -0500
+Date: Mon, 3 Oct 2022 08:17:50 -0500
 Subject: [PATCH] Equipment Packet Caching
 
 
@@ -25,11 +25,26 @@ index 5a8f850b447fc3a4bd0eb0c505bbdfc8be7115e8..34d74735b7a7d258c6bd14bb7e540693
          this.entity = buf.readVarInt();
          EquipmentSlot[] equipmentSlots = EquipmentSlot.values();
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index a514a1f26e439b5959093488ec9905fec327a404..0ac580f3cf8f95025992420702d67ad56db2ba05 100644
+index d9481017e36f607c6dee8ab833a36ac700267a9f..48830e44dcae2a5263dbae65506c5cb29e1ea2a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -328,27 +328,8 @@ public class ServerEntity {
-             sender.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
+@@ -3,12 +3,8 @@ package net.minecraft.server.level;
+ import com.google.common.collect.Lists;
+ import com.mojang.datafixers.util.Pair;
+ import com.mojang.logging.LogUtils;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Objects;
+-import java.util.Set;
++
++import java.util.*;
+ import java.util.function.Consumer;
+ import net.minecraft.network.protocol.Packet;
+ import net.minecraft.network.protocol.game.ClientboundAddMobPacket;
+@@ -310,27 +306,8 @@ public class ServerEntity {
+             consumer.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
          }
  
 -        if (this.entity instanceof LivingEntity) {
@@ -50,28 +65,69 @@ index a514a1f26e439b5959093488ec9905fec327a404..0ac580f3cf8f95025992420702d67ad5
 -            }
 -
 -            if (!list.isEmpty()) {
--                sender.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list));
+-                consumer.accept(new ClientboundSetEquipmentPacket(this.entity.getId(), list));
 -            }
 -            ((LivingEntity) this.entity).detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
 +        if (this.entity instanceof LivingEntity livingEntity) {
-+            livingEntity.sendEquipment(sender, player); // Slice
++            livingEntity.sendEquipment(entityplayer); // Slice
          }
  
-         // CraftBukkit start - MC-109346: Fix for nonsensical head yaw
+         // CraftBukkit start - Fix for nonsensical head yaw
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 44612616560c087ca80bd10c2077e955f5ce7c85..505d5de63dec642974ac8fda477450164b87caf6 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -6,14 +6,8 @@ import com.mojang.authlib.GameProfile;
+ import com.mojang.datafixers.util.Either;
+ import com.mojang.logging.LogUtils;
+ import com.mojang.serialization.DataResult;
+-import java.util.Collection;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Objects;
+-import java.util.Optional;
+-import java.util.OptionalInt;
+-import java.util.Random;
+-import java.util.UUID;
++
++import java.util.*;
+ import javax.annotation.Nullable;
+ import net.minecraft.BlockUtil;
+ import net.minecraft.ChatFormatting;
+@@ -2447,4 +2441,19 @@ public class ServerPlayer extends Player {
+     // CraftBukkit end
+ 
+     public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder
++
++    // Slice
++    public net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket setCachedEquipment(String tag, java.util.Map<org.bukkit.inventory.EquipmentSlot, org.bukkit.inventory.ItemStack> equipment) {
++        List<com.mojang.datafixers.util.Pair<net.minecraft.world.entity.EquipmentSlot, net.minecraft.world.item.ItemStack>> pairs = new ArrayList<>(equipment.size());
++        for (java.util.Map.Entry<org.bukkit.inventory.EquipmentSlot, org.bukkit.inventory.ItemStack> entry : equipment.entrySet()) {
++            com.mojang.datafixers.util.Pair<net.minecraft.world.entity.EquipmentSlot, net.minecraft.world.item.ItemStack> pair = com.mojang.datafixers.util.Pair.of(net.minecraft.world.entity.EquipmentSlot.byName(entry.getKey().name()),
++                    CraftItemStack.asNMSCopy(entry.getValue()));
++            pairs.add(pair);
++        }
++
++        net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket packet = new net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket(getId(), pairs);
++        cachedEquipmentMap.put(tag, packet);
++        return packet;
++    }
++    // Slice end
+ }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45d7cac757 100644
+index 9002ace5beb17b5a8b7efd0e83de17f2dbfc054a..6b504b854ccd9f0d63baf4cff4b1f279335b7dde 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -263,6 +263,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -262,6 +262,8 @@ public abstract class LivingEntity extends Entity {
+     public boolean bukkitPickUpLoot;
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
 +    private final com.google.common.collect.Table<String, ItemStack, ItemStack> equipmentPacketCache = com.google.common.collect.HashBasedTable.create(); // Slice
 +    public java.util.Map<String, net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket> cachedEquipmentMap = new java.util.HashMap<>(); // Slice
  
      @Override
      public float getBukkitYaw() {
-@@ -3071,6 +3073,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3002,6 +3004,7 @@ public abstract class LivingEntity extends Entity {
          if (map != null) {
              this.handleHandSwap(map);
              if (!map.isEmpty()) {
@@ -79,20 +135,20 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
                  this.handleEquipmentChanges(map);
              }
          }
-@@ -3163,7 +3166,25 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3090,7 +3093,25 @@ public abstract class LivingEntity extends Entity {
              }
  
          });
--        ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
+-        ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
 +
 +        // Slice start
-+        net.minecraft.server.level.ChunkMap.TrackedEntity entityTracker = ((ServerLevel) this.level()).getChunkSource().chunkMap.entityMap.get(getId());
++        net.minecraft.server.level.ChunkMap.TrackedEntity entityTracker = ((ServerLevel) this.level).getChunkSource().chunkMap.entityMap.get(getId());
 +        if (entityTracker != null) {
 +            ClientboundSetEquipmentPacket packet = new ClientboundSetEquipmentPacket(this.getId(), list);
 +            for (net.minecraft.server.network.ServerPlayerConnection playerConnection : entityTracker.seenBy) {
 +                ServerPlayer player = playerConnection.getPlayer();
 +                org.bukkit.event.player.PlayerReceiveEquipmentEvent event = new org.bukkit.event.player.PlayerReceiveEquipmentEvent(player.getBukkitEntity(), getBukkitEntity());
-+                level().getCraftServer().getPluginManager().callEvent(event);
++                level.getCraftServer().getPluginManager().callEvent(event);
 +
 +                String tag = event.getTag();
 +                if (tag != null) {
@@ -106,11 +162,10 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
      }
  
      // Paper start - hide unnecessary item meta
-@@ -4450,4 +4471,74 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     public static record Fallsounds(SoundEvent small, SoundEvent big) {
- 
+@@ -4320,6 +4341,26 @@ public abstract class LivingEntity extends Entity {
+         this.setDeltaMovement((double) ((float) packet.getXd() / 8000.0F), (double) ((float) packet.getYd() / 8000.0F), (double) ((float) packet.getZd() / 8000.0F));
      }
-+
+ 
 +    // Slice start
 +    public ItemStack getOrCreateCachedEquipmentItem(String tag, EquipmentSlot slot, ItemStack itemStack) {
 +        return equipmentPacketCache.row(tag).computeIfAbsent(itemStack, i -> {
@@ -124,17 +179,25 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
 +            }
 +
 +            org.bukkit.event.entity.EntityEquipmentItemLookup event = new org.bukkit.event.entity.EntityEquipmentItemLookup(getBukkitEntity(), tag, org.bukkit.inventory.EquipmentSlot.valueOf(name), CraftItemStack.asBukkitCopy(i));
-+            this.level().getCraftServer().getPluginManager().callEvent(event);
++            this.level.getCraftServer().getPluginManager().callEvent(event);
 +            org.bukkit.inventory.ItemStack eventItem = event.getItemStack();
 +            return CraftItemStack.asNMSCopy(eventItem);
 +        });
 +    }
 +    // Slice end
++
+     // CraftBukkit start - decompile error
+     public static record Fallsounds(SoundEvent small, SoundEvent big) {
+ 
+@@ -4342,4 +4383,54 @@ public abstract class LivingEntity extends Entity {
+          */
+         // CraftBukkit end
+     }
 +
 +    // Slice start
-+    public void sendEquipment(java.util.function.Consumer<net.minecraft.network.protocol.Packet<net.minecraft.network.protocol.game.ClientGamePacketListener>> consumer, ServerPlayer p) {
++    public void sendEquipment(ServerPlayer p) {
 +        org.bukkit.event.player.PlayerReceiveEquipmentEvent event = new org.bukkit.event.player.PlayerReceiveEquipmentEvent(p.getBukkitEntity(), getBukkitEntity());
-+        level().getCraftServer().getPluginManager().callEvent(event);
++        level.getCraftServer().getPluginManager().callEvent(event);
 +
 +        boolean sendEquipment = !event.isCancelled();
 +        String tag = event.getTag();
@@ -142,7 +205,7 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
 +            ClientboundSetEquipmentPacket equipmentPacket = player.cachedEquipmentMap.get(tag);
 +            if (equipmentPacket != null) {
 +                //Event says use a tag, and our tag exists; so we simply used our entire cached packet
-+                consumer.accept(equipmentPacket);
++                p.connection.send(equipmentPacket);
 +                sendEquipment = false;
 +            }
 +        }
@@ -173,7 +236,7 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
 +                if (tag != null) {
 +                    cachedEquipmentMap.put(tag, equipmentPacket);
 +                }
-+                consumer.accept(equipmentPacket);
++                p.connection.send(equipmentPacket);
 +            }
 +
 +            detectEquipmentUpdates(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
@@ -181,21 +244,35 @@ index 836c007db96b115a0f7a869649e9ed4738920093..b6c320554693d1b55a385c45784feb45
 +    }
 +    // Slice end
  }
+diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
+index 070dab06db870f3c67dffe7637fe1a92c7eaa6a8..1005f44dd5a6906351852ea5fb35360683765cc6 100644
+--- a/src/main/java/net/minecraft/world/item/ItemStack.java
++++ b/src/main/java/net/minecraft/world/item/ItemStack.java
+@@ -695,7 +695,9 @@ public final class ItemStack {
+     }
+ 
+     public static boolean isSameIgnoreDurability(ItemStack left, ItemStack right) {
+-        return left == right ? true : (!left.isEmpty() && !right.isEmpty() ? left.sameItemStackIgnoreDurability(right) : false);
++        boolean rightEmpty = right.isEmpty();
++        boolean leftEmpty = left.isEmpty();
++        return left == right || leftEmpty && rightEmpty ? true : (!leftEmpty && !rightEmpty ? left.sameItemStackIgnoreDurability(right) : false);
+     }
+ 
+     public boolean sameItem(ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b25f5931f836fd4d8695120f0bcb7c52deff8583..68507518df679a354534a82f32a011727ae7cea0 100644
+index c022751e3b45469cc0ad6732e2d6ff08918bafa4..04708105c6264bfacd0cc20a25178f7a62ebd78e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1099,4 +1099,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         getHandle().knockback(strength, directionX, directionZ);
-     };
+@@ -920,4 +920,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
+     }
      // Paper end
 +
 +    // Slice start
 +    @Override
 +    public void sendEquipment(Player p) {
 +        if (entity instanceof net.minecraft.world.entity.LivingEntity livingEntity) {
-+            net.minecraft.server.level.ServerPlayer serverPlayer = ((CraftPlayer) p).getHandle();
-+            livingEntity.sendEquipment(packet -> serverPlayer.connection.send(packet), serverPlayer);
++            livingEntity.sendEquipment(((CraftPlayer) p).getHandle());
 +        }
 +    }
 +    // Slice end

patches/server/0026-AntiXray-Bypass.patch

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 10 Apr 2023 08:46:54 -0500
+Date: Sun, 6 Nov 2022 08:29:18 -0600
 Subject: [PATCH] AntiXray Bypass
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-index 42fdce97d99618a53f2e9c51804ff2205b574f69..7e8d58e3481be2d7ebbe5fe388d61932479e7721 100644
+index 8e2baa21f71e7105a8e72cba4ded6aa99370fca0..b295dcb214d54cd049e0b8e59c02b165714eacdd 100644
 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-@@ -165,6 +165,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo
+@@ -161,6 +161,7 @@ public final class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockCo
  
      @Override
      public boolean shouldModify(ServerPlayer player, LevelChunk chunk) {
@@ -17,10 +17,10 @@ index 42fdce97d99618a53f2e9c51804ff2205b574f69..7e8d58e3481be2d7ebbe5fe388d61932
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 767a33cdce4b438164bf4101ff39cd7b1e8f929e..0af1801085701437f06c9ecaf8864fe875e90509 100644
+index df22a1407f3d1e93f0f1d50b5dbec3df12b106d2..2e7c1a99697c31f005a62b5d663708c9d4bc85df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -196,6 +196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -174,6 +174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
      private long lastSaveTime;
      // Paper end
@@ -28,7 +28,7 @@ index 767a33cdce4b438164bf4101ff39cd7b1e8f929e..0af1801085701437f06c9ecaf8864fe8
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2827,6 +2828,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2432,6 +2433,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  

patches/server/0026-Maybe-can-t-tostring.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sat, 6 May 2023 18:14:26 -0500
-Subject: [PATCH] Maybe can't tostring?
-
-
-diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index 7e94ebe06fc62293e665d6db19e42d947e7eb30f..158c012b8a6808ca0f820c2997af282529148c7c 100644
---- a/src/main/java/net/minecraft/nbt/CompoundTag.java
-+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
-@@ -466,6 +466,9 @@ public class CompoundTag implements Tag {
-     @Override
-     public CompoundTag copy() {
-         // Paper start - reduce memory footprint of NBTTagCompound
-+        if (this.tags.size() < 0) {
-+            net.minecraft.server.MinecraftServer.LOGGER.debug("Tried to copy an invalid item with negative tags: {}, {}, {}, {}", this.tags, this.tags.getClass().getName());
-+        }
-         it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<String, Tag> ret = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(this.tags.size(), 0.8f);
-         java.util.Iterator<java.util.Map.Entry<String, Tag>> iterator = (this.tags instanceof it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) ? ((it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap)this.tags).object2ObjectEntrySet().fastIterator() : this.tags.entrySet().iterator();
-         while (iterator.hasNext()) {
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2b3b1c5ccdf58ee9b46d404cfa3790d0fdc2df3d..b31f21e2d9faa00174bbcbbd1e0cf1b22c8b69d4 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -736,7 +736,11 @@ public final class ItemStack {
- 
-             itemstack.setPopTime(this.getPopTime());
-             if (this.tag != null) {
--                itemstack.tag = this.tag.copy();
-+                if (this.tag.tags.size() < 0) {
-+                    ItemStack.LOGGER.debug("Tried to copy an invalid item with negative tags: {}, {}, {}, {}", this.tag, this.tag.tags, this.tag.tags.getClass().getName());
-+                } else {
-+                    itemstack.tag = this.tag.copy();
-+                }
-             }
- 
-             return itemstack;

patches/server/0027-Allow-inventory-clicks-in-Spectator.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 22 May 2023 08:21:18 -0500
-Subject: [PATCH] Allow inventory clicks in Spectator
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3c0651fa5a5db880202c9a3805a6455269c5f16d..42e61e55ef45935e1f690eefa56bc36842cdd974 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3030,7 +3030,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         if (this.player.isImmobile()) return; // CraftBukkit
-         this.player.resetLastActionTime();
-         if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
--            boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
-+            boolean cancelled = false; //Slice - allow spectator inv management this.player.isSpectator(); // CraftBukkit - see below if
-             if (false/*this.player.isSpectator()*/) { // CraftBukkit
-                 this.player.containerMenu.sendAllDataToRemote();
-             } else if (!this.player.containerMenu.stillValid(this.player)) {

patches/server/0027-PlayerPreChunkLoadEvent.patch

@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cryptite <cryptite@gmail.com>
+Date: Mon, 7 Nov 2022 22:44:22 -0600
+Subject: [PATCH] PlayerPreChunkLoadEvent
+
+
+diff --git a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
+index 12bcf96ec1ba4314c7ea2eab9f3d140559f1dc08..d8773c7c36314b4f5953b9e7abc310c74401c23c 100644
+--- a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
++++ b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
+@@ -3,6 +3,7 @@ package io.papermc.paper.chunk;
+ import com.destroystokyo.paper.PaperConfig;
+ import com.destroystokyo.paper.util.misc.PlayerAreaMap;
+ import com.destroystokyo.paper.util.misc.PooledLinkedHashSets;
++import io.papermc.paper.event.packet.PlayerPreChunkLoadEvent;
+ import io.papermc.paper.util.CoordinateUtils;
+ import io.papermc.paper.util.IntervalledCounter;
+ import io.papermc.paper.util.TickThread;
+@@ -787,7 +788,7 @@ public final class PlayerChunkLoader {
+         // warning: modifications of this field must be aware that the loadQueue inside PlayerChunkLoader uses this field
+         // in a comparator!
+         protected final ArrayDeque<ChunkPriorityHolder> loadQueue = new ArrayDeque<>();
+-        protected final LongOpenHashSet sentChunks = new LongOpenHashSet();
++        public final LongOpenHashSet sentChunks = new LongOpenHashSet(); // Slice - public
+         protected final LongOpenHashSet chunksToBeSent = new LongOpenHashSet();
+ 
+         protected final TreeSet<ChunkPriorityHolder> sendQueue = new TreeSet<>((final ChunkPriorityHolder p1, final ChunkPriorityHolder p2) -> {
+@@ -871,7 +872,14 @@ public final class PlayerChunkLoader {
+         }
+ 
+         public void sendChunk(final int chunkX, final int chunkZ, final Runnable onChunkSend) {
+-            if (this.sentChunks.add(CoordinateUtils.getChunkKey(chunkX, chunkZ))) {
++            // Slice start
++            if (!new PlayerPreChunkLoadEvent(this.player.getBukkitEntity().getWorld(), chunkX, chunkZ, this.player.getBukkitEntity()).callEvent()) {
++                this.player.connection.connection.execute(onChunkSend);
++                return;
++            }
++            // Slice end
++
++            if (this.sentChunks.add(CoordinateUtils.getChunkKey(chunkX, chunkZ))) {  // Slice
+                 this.player.getLevel().getChunkSource().chunkMap.updateChunkTracking(this.player,
+                         new ChunkPos(chunkX, chunkZ), new MutableObject<>(), false, true); // unloaded, loaded
+                 this.player.connection.connection.execute(onChunkSend);
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 9d400d82eeab062322acea81b87f6fc572151700..ee35b5ac41d2016a775b320b1a84fceb6329c4be 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -528,6 +528,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         return true;
+     }
+ 
++    @Override
++    public it.unimi.dsi.fastutil.longs.LongOpenHashSet getSentChunks(Player p) {
++        CraftPlayer craftPlayer = (CraftPlayer) p;
++        io.papermc.paper.chunk.PlayerChunkLoader.PlayerLoaderData data = this.world.chunkSource.chunkMap.playerChunkManager.getData(craftPlayer.getHandle());
++        return data != null ? data.sentChunks : null;
++    }
++
+     @Override
+     public boolean isChunkInUse(int x, int z) {
+         return this.isChunkLoaded(x, z);
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 2e7c1a99697c31f005a62b5d663708c9d4bc85df..b62a427b123f0573e15e6e38ff67029eadd69966 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2214,13 +2214,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         }
+         // Paper end
+     }
+-    
++
+     @Override
+     public void sendHealthUpdate() {
+         this.sendHealthUpdate(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
+     }
+     // Paper end
+-    
++
+     public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
+         if (!this.scaledHealth && !force) {
+             return;

patches/server/0028-Shared-Data-Folder-for-maps.patch

@@ -1,42 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cryptite <cryptite@gmail.com>
-Date: Mon, 12 Jun 2023 14:09:36 -0500
-Subject: [PATCH] Shared Data Storage
+Date: Mon, 14 Nov 2022 07:37:41 -0600
+Subject: [PATCH] Shared Data Folder for maps
 
 
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 3bc7230ca62ebe3426da293e436a962bb0134f85..a812bd61e0352023cfd44e62a9cf722616ba4358 100644
---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -318,6 +318,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public boolean useDimensionTypeForCustomSpawners = false;
-         public boolean strictAdvancementDimensionCheck = false;
-         public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
-+        public String sharedDataFolder = ""; // Slice
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index fafbebbb5e8c1a381b673f97f1fa210687b52823..8c846971b56930ff10740986d71ad47afc2b79d1 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -693,4 +693,11 @@ public class PaperConfig {
+     private static void useProxyProtocol() {
+         useProxyProtocol = getBoolean("settings.proxy-protocol", false);
+     }
++
++    // Slice start
++    public static String sharedDataFolder;
++    private static void sharedDataFolder() {
++        sharedDataFolder = getString("settings.shared-data-folder", null);
++    }
++    // Slice end
  }
- 
-     public BlockUpdates blockUpdates;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d3649a28862c 100644
+index ce51ebeb5df07abc4a8bb31bc737ab3e4214ce83..8129c62692b9d1c4be85387dc52096b94956920e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2,6 +2,7 @@ package net.minecraft.server;
+@@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
- import com.google.common.base.Preconditions;
- import com.google.common.base.Splitter;
-+import com.google.common.base.Strings;
- import com.google.common.collect.ImmutableList;
- import co.aikar.timings.Timings;
- import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-@@ -310,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-     public boolean isIteratingOverLevels = false; // Paper
 +    public @Nullable DimensionDataStorage sharedDataStorage; // Slice
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -410,6 +412,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -407,6 +408,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -49,7 +45,7 @@ index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d364
      private void readScoreboard(DimensionDataStorage persistentStateManager) {
          ServerScoreboard scoreboardserver = this.getScoreboard();
  
-@@ -885,6 +893,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -919,6 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.isSaving = true;
              this.getPlayerList().saveAll(); // Diff on change
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
@@ -57,13 +53,13 @@ index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d364
          } finally {
              this.isSaving = false;
          }
-@@ -1101,6 +1110,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 throw new IllegalStateException("Failed to initialize server");
-             }
- 
+@@ -1161,6 +1169,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         try {
+             long serverStartTime = Util.getNanos(); // Paper
+             if (this.initServer()) {
 +                // Slice start
-+            String sharedDataFolder = io.papermc.paper.configuration.GlobalConfiguration.get().misc.sharedDataFolder;
-+            if (!Strings.isNullOrEmpty(sharedDataFolder)) {
++                String sharedDataFolder = com.destroystokyo.paper.PaperConfig.sharedDataFolder;
++                if (sharedDataFolder != null) {
 +                    File sharedDir = new File(sharedDataFolder);
 +                    sharedDir.mkdirs();
 +                    this.sharedDataStorage = new DimensionDataStorage(sharedDir, fixerUpper);
@@ -71,9 +67,9 @@ index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d364
 +                // Slice end
 +
                  this.nextTickTime = Util.getMillis();
-             this.statusIcon = (ServerStatus.Favicon) this.loadStatusIcon().orElse(null); // CraftBukkit - decompile error
-             this.status = this.buildServerStatus();
-@@ -1413,6 +1431,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 this.status.setDescription(new TextComponent(this.motd));
+                 this.status.setVersion(new ServerStatus.Version(SharedConstants.getCurrentVersion().getName(), SharedConstants.getCurrentVersion().getProtocolVersion()));
+@@ -1492,6 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      level.saveIncrementally(fullSave);
                  }
              }
@@ -82,10 +78,10 @@ index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d364
              this.isSaving = false;
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index af0720fb8bd334aac5493121c6373d87421204b4..564591e9f18dd6bb0f76ae4f153adcc0a228d4fa 100644
+index 9b3af8f2a433368d722cd442c07b2a2cfb16dc54..f460d21bcc7ba36763410851cf92a7053d85fc96 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2068,7 +2068,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1845,7 +1845,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public MapItemSavedData getMapData(String id) {
          // CraftBukkit start
@@ -94,7 +90,7 @@ index af0720fb8bd334aac5493121c6373d87421204b4..564591e9f18dd6bb0f76ae4f153adcc0
              // We only get here when the data file exists, but is not a valid map
              MapItemSavedData newMap = MapItemSavedData.load(nbttagcompound);
              newMap.id = id;
-@@ -2082,12 +2082,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1859,12 +1859,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public void setMapData(String id, MapItemSavedData state) {
          state.id = id; // CraftBukkit
@@ -120,7 +116,7 @@ index af0720fb8bd334aac5493121c6373d87421204b4..564591e9f18dd6bb0f76ae4f153adcc0
  
      // Paper start - helper function for configurable spawn radius
 diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-index defe31a5d3aa89a3d18b94f2ff005594e38754b3..637a86e74d633901fdd2f2f1ba6aa4ed49780ead 100644
+index 0465b397b628b11a6fc52e3375945c94d68cfdd5..14296686772b74a45543227dc1e74a9c71c58cef 100644
 --- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
 @@ -58,7 +58,7 @@ public class DimensionDataStorage {

patches/server/0029-Long-distance-tracking.patch

@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 6 Jun 2023 08:14:08 -0500
-Subject: [PATCH] Long distance tracking
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e08b72010f22ce680e88f443782bdfe6a46285f9..3809b2125254424d4939794961a9f08254af54c8 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1551,6 +1551,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 // Paper end - remove allocation of Vec3D here
-                 Vec3 vec3d = player.position().subtract(this.entity.position());
-                 double d0 = (double) Math.min(this.getEffectiveRange(), io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player) * 16); // Paper - per player view distance
-+                if (this.entity instanceof ServerPlayer serverPlayer && player.canSeeFromLongDistance(serverPlayer)) d0 = Math.min(level.spigotConfig.flyingPlayerTrackingRange, d0); // Slice
-                 double d1 = vec3d_dx * vec3d_dx + vec3d_dz * vec3d_dz; // Paper
-                 double d2 = d0 * d0;
-                 boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c610111cde3d1cecac661549511742231e1e47c3..069665c210f2c3f8aec8c13c1c0c2ab5c50d3e24 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
-     public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
-     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
-     public boolean smoothWorldTeleport; // Slice
-+    public boolean hasLongDistanceTracking; // Slice
- 
-     private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
-     public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -2656,4 +2657,18 @@ public class ServerPlayer extends Player {
-         return (CraftPlayer) super.getBukkitEntity();
-     }
-     // CraftBukkit end
-+
-+    // Slice start
-+    public boolean canSeeFromLongDistance(ServerPlayer other) {
-+        if (hasLongDistanceTracking) return true;
-+
-+        CraftPlayer bukkitEntity = other.getBukkitEntity();
-+        return bukkitEntity.isGliding() || bukkitEntity.isFlying();
-+    }
-+
-+    public boolean canBeSeenLongDistance() {
-+        CraftPlayer bukkitEntity = getBukkitEntity();
-+        return bukkitEntity.isGliding() || bukkitEntity.isFlying();
-+    }
-+    // Slice end
- }
-diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..507519c75fabe8991cddbc1aa7813cec25dee01b 100644
---- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -271,6 +271,7 @@ public class SpigotWorldConfig
-     }
- 
-     public int playerTrackingRange = 48;
-+    public int flyingPlayerTrackingRange = 64; // Slice
-     public int animalTrackingRange = 48;
-     public int monsterTrackingRange = 48;
-     public int miscTrackingRange = 32;
-@@ -279,6 +280,7 @@ public class SpigotWorldConfig
-     private void trackingRange()
-     {
-         this.playerTrackingRange = this.getInt( "entity-tracking-range.players", this.playerTrackingRange );
-+        this.flyingPlayerTrackingRange = this.getInt( "entity-tracking-range.flying-players", this.flyingPlayerTrackingRange ); // Slice
-         this.animalTrackingRange = this.getInt( "entity-tracking-range.animals", this.animalTrackingRange );
-         this.monsterTrackingRange = this.getInt( "entity-tracking-range.monsters", this.monsterTrackingRange );
-         this.miscTrackingRange = this.getInt( "entity-tracking-range.misc", this.miscTrackingRange );
-diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 8fca15099952626ee537f5ce3eefdfaa6518dc1b..1ddf149ce3d962905bec8c4562e4d86fbbe6e570 100644
---- a/src/main/java/org/spigotmc/TrackingRange.java
-+++ b/src/main/java/org/spigotmc/TrackingRange.java
-@@ -26,9 +26,9 @@ public class TrackingRange
-             return defaultRange;
-         }
-         SpigotWorldConfig config = entity.level().spigotConfig;
--        if ( entity instanceof ServerPlayer )
-+        if ( entity instanceof ServerPlayer serverPlayer)
-         {
--            return config.playerTrackingRange;
-+            return serverPlayer.canBeSeenLongDistance() ? config.flyingPlayerTrackingRange : config.playerTrackingRange;
-         // Paper start - Simplify and set water mobs to animal tracking range
-         }
-         switch (entity.activationType) {

patches/server/0032-Add-canDespawn-to-Warden.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Fri, 23 Jun 2023 08:22:19 -0500
-Subject: [PATCH] Add canDespawn to Warden
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..286e2ad0887379b5b16ca3ca89a8f0d62be258e7 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -588,7 +588,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-         }), (entity) -> {
-             entity.load(nbt);
-         }, () -> {
--            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
-+            //EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.toString());
-         });
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 97b763431bc5015448ee7a26a340635a932c950b..e8b748eb16d7409a69dbd364a59dcf217ce701ec 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -110,6 +110,7 @@ public class Warden extends Monster implements VibrationSystem {
-     private final VibrationSystem.User vibrationUser = new Warden.VibrationUser();
-     private VibrationSystem.Data vibrationData = new VibrationSystem.Data();
-     AngerManagement angerManagement = new AngerManagement(this::canTargetEntity, Collections.emptyList());
-+    public boolean canDespawn; // Slice
- 
-     public Warden(EntityType<? extends Monster> type, Level world) {
-         super(type, world);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java b/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java
-index 03f16a5541de6bc95407aaa24741570c1993dc9e..07600fdd32a058d0e3f9828efdc18f5e76448663 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/WardenAi.java
-@@ -139,7 +139,13 @@ public class WardenAi {
- 
-     public static void setDigCooldown(LivingEntity warden) {
-         if (warden.getBrain().hasMemoryValue(MemoryModuleType.DIG_COOLDOWN)) {
--            warden.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L);
-+            // Slice start
-+            if (warden instanceof Warden nmsWarden && !nmsWarden.canDespawn) {
-+                warden.getBrain().setMemory(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE);
-+            } else {
-+                warden.getBrain().setMemoryWithExpiry(MemoryModuleType.DIG_COOLDOWN, Unit.INSTANCE, 1200L);
-+            }
-+            // Slice end
-         }
- 
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-index 46e3cc146a4b109c4baaf94f42d825646abade68..b248150c047890f45fae75716e40e495752f3732 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-@@ -86,4 +86,11 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
-             case ANGRY -> AngerLevel.ANGRY;
-         };
-     }
-+
-+    // Slice start
-+    @Override
-+    public void setCanDespawn(boolean canDespawn) {
-+        this.getHandle().canDespawn = canDespawn;
-+    }
-+    // Slice end
- }

patches/server/0033-Save-DimensionDataStorage-async.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Mon, 26 Jun 2023 16:45:00 -0500
-Subject: [PATCH] Save DimensionDataStorage async
-
-
-diff --git a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-index 637a86e74d633901fdd2f2f1ba6aa4ed49780ead..8cf3880d9168b5ba6b383ec921bfb490ea51ac38 100644
---- a/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-+++ b/src/main/java/net/minecraft/world/level/storage/DimensionDataStorage.java
-@@ -9,6 +9,8 @@ import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.PushbackInputStream;
- import java.util.Map;
-+import java.util.concurrent.CompletableFuture;
-+import java.util.concurrent.ConcurrentHashMap;
- import java.util.function.Function;
- import java.util.function.Supplier;
- import javax.annotation.Nullable;
-@@ -18,11 +20,12 @@ import net.minecraft.nbt.NbtIo;
- import net.minecraft.nbt.NbtUtils;
- import net.minecraft.util.datafix.DataFixTypes;
- import net.minecraft.world.level.saveddata.SavedData;
-+import org.bukkit.Bukkit;
- import org.slf4j.Logger;
- 
- public class DimensionDataStorage {
-     private static final Logger LOGGER = LogUtils.getLogger();
--    public final Map<String, SavedData> cache = Maps.newHashMap();
-+    public final Map<String, SavedData> cache = new ConcurrentHashMap<>();
-     private final DataFixer fixerUpper;
-     private final File dataFolder;
- 
-@@ -51,7 +54,7 @@ public class DimensionDataStorage {
-         SavedData savedData = this.cache.get(id);
-         if (savedData == null && !this.cache.containsKey(id)) {
-             savedData = this.readSavedData(readFunction, id);
--            this.cache.put(id, savedData);
-+            if (savedData != null) this.cache.put(id, savedData);
-         }
- 
-         return (T)savedData;
-@@ -119,11 +122,12 @@ public class DimensionDataStorage {
-     }
- 
-     public void save() {
--        this.cache.forEach((id, state) -> {
-+        // Slice start - run async
-+        CompletableFuture.runAsync(() -> this.cache.forEach((id, state) -> {
-             if (state != null) {
-                 state.save(this.getDataFile(id));
-             }
--
--        });
-+        }));
-+        // Slice end
-     }
- }

patches/server/0034-Add-reason-to-PlayerConnectionCloseEvent.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 22 Aug 2023 06:22:16 -0500
-Subject: [PATCH] Add reason to PlayerConnectionCloseEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2ff578e4a953ffcf5176815ba8e3f06f73499989..f9a1b0e3be862cc00370c130621a07be5deebf0c 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -193,6 +193,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
- 
-                 this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
-                 this.connection.disconnect(ichatmutablecomponent);
-+                new com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent(this.gameProfile.getId(), this.gameProfile.getName(), ((java.net.InetSocketAddress)this.connection.address).getAddress(), com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent.ConnectionCloseReason.INVALID_PLAYER_DATA, false).callEvent(); // Slice
-             }
-         }
- 

patches/server/0035-Disable-feature-generation.patch

@@ -1,314 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sat, 26 Aug 2023 07:39:46 -0500
-Subject: [PATCH] Disable feature generation
-
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
-index f945fae50983424091b58f83ed14f2e8f2621619..b4c16e355ebadf06b9405c06e2b598e7a478f6ab 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java
-@@ -33,139 +33,5 @@ public class GeodeFeature extends Feature<GeodeConfiguration> {
-     }
- 
-     @Override
--    public boolean place(FeaturePlaceContext<GeodeConfiguration> context) {
--        GeodeConfiguration geodeConfiguration = context.config();
--        RandomSource randomSource = context.random();
--        BlockPos blockPos = context.origin();
--        WorldGenLevel worldGenLevel = context.level();
--        int i = geodeConfiguration.minGenOffset;
--        int j = geodeConfiguration.maxGenOffset;
--        List<Pair<BlockPos, Integer>> list = Lists.newLinkedList();
--        int k = geodeConfiguration.distributionPoints.sample(randomSource);
--        WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed()));
--        NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0D);
--        List<BlockPos> list2 = Lists.newLinkedList();
--        double d = (double)k / (double)geodeConfiguration.outerWallDistance.getMaxValue();
--        GeodeLayerSettings geodeLayerSettings = geodeConfiguration.geodeLayerSettings;
--        GeodeBlockSettings geodeBlockSettings = geodeConfiguration.geodeBlockSettings;
--        GeodeCrackSettings geodeCrackSettings = geodeConfiguration.geodeCrackSettings;
--        double e = 1.0D / Math.sqrt(geodeLayerSettings.filling);
--        double f = 1.0D / Math.sqrt(geodeLayerSettings.innerLayer + d);
--        double g = 1.0D / Math.sqrt(geodeLayerSettings.middleLayer + d);
--        double h = 1.0D / Math.sqrt(geodeLayerSettings.outerLayer + d);
--        double l = 1.0D / Math.sqrt(geodeCrackSettings.baseCrackSize + randomSource.nextDouble() / 2.0D + (k > 3 ? d : 0.0D));
--        boolean bl = (double)randomSource.nextFloat() < geodeCrackSettings.generateCrackChance;
--        int m = 0;
--
--        for(int n = 0; n < k; ++n) {
--            int o = geodeConfiguration.outerWallDistance.sample(randomSource);
--            int p = geodeConfiguration.outerWallDistance.sample(randomSource);
--            int q = geodeConfiguration.outerWallDistance.sample(randomSource);
--            BlockPos blockPos2 = blockPos.offset(o, p, q);
--            BlockState blockState = worldGenLevel.getBlockState(blockPos2);
--            if (blockState.isAir() || blockState.is(BlockTags.GEODE_INVALID_BLOCKS)) {
--                ++m;
--                if (m > geodeConfiguration.invalidBlocksThreshold) {
--                    return false;
--                }
--            }
--
--            list.add(Pair.of(blockPos2, geodeConfiguration.pointOffset.sample(randomSource)));
--        }
--
--        if (bl) {
--            int r = randomSource.nextInt(4);
--            int s = k * 2 + 1;
--            if (r == 0) {
--                list2.add(blockPos.offset(s, 7, 0));
--                list2.add(blockPos.offset(s, 5, 0));
--                list2.add(blockPos.offset(s, 1, 0));
--            } else if (r == 1) {
--                list2.add(blockPos.offset(0, 7, s));
--                list2.add(blockPos.offset(0, 5, s));
--                list2.add(blockPos.offset(0, 1, s));
--            } else if (r == 2) {
--                list2.add(blockPos.offset(s, 7, s));
--                list2.add(blockPos.offset(s, 5, s));
--                list2.add(blockPos.offset(s, 1, s));
--            } else {
--                list2.add(blockPos.offset(0, 7, 0));
--                list2.add(blockPos.offset(0, 5, 0));
--                list2.add(blockPos.offset(0, 1, 0));
--            }
--        }
--
--        List<BlockPos> list3 = Lists.newArrayList();
--        Predicate<BlockState> predicate = isReplaceable(geodeConfiguration.geodeBlockSettings.cannotReplace);
--
--        for(BlockPos blockPos3 : BlockPos.betweenClosed(blockPos.offset(i, i, i), blockPos.offset(j, j, j))) {
--            double t = normalNoise.getValue((double)blockPos3.getX(), (double)blockPos3.getY(), (double)blockPos3.getZ()) * geodeConfiguration.noiseMultiplier;
--            double u = 0.0D;
--            double v = 0.0D;
--
--            for(Pair<BlockPos, Integer> pair : list) {
--                u += Mth.invSqrt(blockPos3.distSqr(pair.getFirst()) + (double)pair.getSecond().intValue()) + t;
--            }
--
--            for(BlockPos blockPos4 : list2) {
--                v += Mth.invSqrt(blockPos3.distSqr(blockPos4) + (double)geodeCrackSettings.crackPointOffset) + t;
--            }
--
--            if (!(u < h)) {
--                if (bl && v >= l && u < e) {
--                    this.safeSetBlock(worldGenLevel, blockPos3, Blocks.AIR.defaultBlockState(), predicate);
--
--                    for(Direction direction : DIRECTIONS) {
--                        BlockPos blockPos5 = blockPos3.relative(direction);
--                        FluidState fluidState = worldGenLevel.getFluidState(blockPos5);
--                        if (!fluidState.isEmpty()) {
--                            worldGenLevel.scheduleTick(blockPos5, fluidState.getType(), 0);
--                        }
--                    }
--                } else if (u >= e) {
--                    this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.fillingProvider.getState(randomSource, blockPos3), predicate);
--                } else if (u >= f) {
--                    boolean bl2 = (double)randomSource.nextFloat() < geodeConfiguration.useAlternateLayer0Chance;
--                    if (bl2) {
--                        this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.alternateInnerLayerProvider.getState(randomSource, blockPos3), predicate);
--                    } else {
--                        this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.innerLayerProvider.getState(randomSource, blockPos3), predicate);
--                    }
--
--                    if ((!geodeConfiguration.placementsRequireLayer0Alternate || bl2) && (double)randomSource.nextFloat() < geodeConfiguration.usePotentialPlacementsChance) {
--                        list3.add(blockPos3.immutable());
--                    }
--                } else if (u >= g) {
--                    this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.middleLayerProvider.getState(randomSource, blockPos3), predicate);
--                } else if (u >= h) {
--                    this.safeSetBlock(worldGenLevel, blockPos3, geodeBlockSettings.outerLayerProvider.getState(randomSource, blockPos3), predicate);
--                }
--            }
--        }
--
--        List<BlockState> list4 = geodeBlockSettings.innerPlacements;
--
--        for(BlockPos blockPos6 : list3) {
--            BlockState blockState2 = Util.getRandom(list4, randomSource);
--
--            for(Direction direction2 : DIRECTIONS) {
--                if (blockState2.hasProperty(BlockStateProperties.FACING)) {
--                    blockState2 = blockState2.setValue(BlockStateProperties.FACING, direction2);
--                }
--
--                BlockPos blockPos7 = blockPos6.relative(direction2);
--                BlockState blockState3 = worldGenLevel.getBlockState(blockPos7);
--                if (blockState2.hasProperty(BlockStateProperties.WATERLOGGED)) {
--                    blockState2 = blockState2.setValue(BlockStateProperties.WATERLOGGED, Boolean.valueOf(blockState3.getFluidState().isSource()));
--                }
--
--                if (BuddingAmethystBlock.canClusterGrowAtState(blockState3)) {
--                    this.safeSetBlock(worldGenLevel, blockPos7, blockState2, predicate);
--                    break;
--                }
--            }
--        }
--
--        return true;
--    }
-+    public boolean place(FeaturePlaceContext<GeodeConfiguration> context) {return false;}
- }
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
-index 3c474c8fc937df5aebfb063be8109053a91e8bb4..2a36bba04d584fdccbb06dc4991064a245082991 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MonsterRoomFeature.java
-@@ -30,103 +30,7 @@ public class MonsterRoomFeature extends Feature<NoneFeatureConfiguration> {
-     }
- 
-     @Override
--    public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
--        Predicate<BlockState> predicate = Feature.isReplaceable(BlockTags.FEATURES_CANNOT_REPLACE);
--        BlockPos blockPos = context.origin();
--        RandomSource randomSource = context.random();
--        WorldGenLevel worldGenLevel = context.level();
--        int i = 3;
--        int j = randomSource.nextInt(2) + 2;
--        int k = -j - 1;
--        int l = j + 1;
--        int m = -1;
--        int n = 4;
--        int o = randomSource.nextInt(2) + 2;
--        int p = -o - 1;
--        int q = o + 1;
--        int r = 0;
--
--        for(int s = k; s <= l; ++s) {
--            for(int t = -1; t <= 4; ++t) {
--                for(int u = p; u <= q; ++u) {
--                    BlockPos blockPos2 = blockPos.offset(s, t, u);
--                    boolean bl = worldGenLevel.getBlockState(blockPos2).isSolid();
--                    if (t == -1 && !bl) {
--                        return false;
--                    }
--
--                    if (t == 4 && !bl) {
--                        return false;
--                    }
--
--                    if ((s == k || s == l || u == p || u == q) && t == 0 && worldGenLevel.isEmptyBlock(blockPos2) && worldGenLevel.isEmptyBlock(blockPos2.above())) {
--                        ++r;
--                    }
--                }
--            }
--        }
--
--        if (r >= 1 && r <= 5) {
--            for(int v = k; v <= l; ++v) {
--                for(int w = 3; w >= -1; --w) {
--                    for(int x = p; x <= q; ++x) {
--                        BlockPos blockPos3 = blockPos.offset(v, w, x);
--                        BlockState blockState = worldGenLevel.getBlockState(blockPos3);
--                        if (v != k && w != -1 && x != p && v != l && w != 4 && x != q) {
--                            if (!blockState.is(Blocks.CHEST) && !blockState.is(Blocks.SPAWNER)) {
--                                this.safeSetBlock(worldGenLevel, blockPos3, AIR, predicate);
--                            }
--                        } else if (blockPos3.getY() >= worldGenLevel.getMinBuildHeight() && !worldGenLevel.getBlockState(blockPos3.below()).isSolid()) {
--                            worldGenLevel.setBlock(blockPos3, AIR, 2);
--                        } else if (blockState.isSolid() && !blockState.is(Blocks.CHEST)) {
--                            if (w == -1 && randomSource.nextInt(4) != 0) {
--                                this.safeSetBlock(worldGenLevel, blockPos3, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), predicate);
--                            } else {
--                                this.safeSetBlock(worldGenLevel, blockPos3, Blocks.COBBLESTONE.defaultBlockState(), predicate);
--                            }
--                        }
--                    }
--                }
--            }
--
--            for(int y = 0; y < 2; ++y) {
--                for(int z = 0; z < 3; ++z) {
--                    int aa = blockPos.getX() + randomSource.nextInt(j * 2 + 1) - j;
--                    int ab = blockPos.getY();
--                    int ac = blockPos.getZ() + randomSource.nextInt(o * 2 + 1) - o;
--                    BlockPos blockPos4 = new BlockPos(aa, ab, ac);
--                    if (worldGenLevel.isEmptyBlock(blockPos4)) {
--                        int ad = 0;
--
--                        for(Direction direction : Direction.Plane.HORIZONTAL) {
--                            if (worldGenLevel.getBlockState(blockPos4.relative(direction)).isSolid()) {
--                                ++ad;
--                            }
--                        }
--
--                        if (ad == 1) {
--                            this.safeSetBlock(worldGenLevel, blockPos4, StructurePiece.reorient(worldGenLevel, blockPos4, Blocks.CHEST.defaultBlockState()), predicate);
--                            RandomizableContainerBlockEntity.setLootTable(worldGenLevel, randomSource, blockPos4, BuiltInLootTables.SIMPLE_DUNGEON);
--                            break;
--                        }
--                    }
--                }
--            }
--
--            this.safeSetBlock(worldGenLevel, blockPos, Blocks.SPAWNER.defaultBlockState(), predicate);
--            BlockEntity blockEntity = worldGenLevel.getBlockEntity(blockPos);
--            if (blockEntity instanceof SpawnerBlockEntity) {
--                SpawnerBlockEntity spawnerBlockEntity = (SpawnerBlockEntity)blockEntity;
--                spawnerBlockEntity.setEntityId(this.randomEntityId(randomSource), randomSource);
--            } else {
--                LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", blockPos.getX(), blockPos.getY(), blockPos.getZ());
--            }
--
--            return true;
--        } else {
--            return false;
--        }
--    }
-+    public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {return false;}
- 
-     private EntityType<?> randomEntityId(RandomSource random) {
-         return Util.getRandom(MOBS, random);
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java
-index f5aea54f81dcd3072e36ddf3c4c6ded848c2c540..1539a644d89b2fee67a5534870ca177b4992409d 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SculkPatchFeature.java
-@@ -19,48 +19,7 @@ public class SculkPatchFeature extends Feature<SculkPatchConfiguration> {
-     }
- 
-     @Override
--    public boolean place(FeaturePlaceContext<SculkPatchConfiguration> context) {
--        WorldGenLevel worldGenLevel = context.level();
--        BlockPos blockPos = context.origin();
--        if (!this.canSpreadFrom(worldGenLevel, blockPos)) {
--            return false;
--        } else {
--            SculkPatchConfiguration sculkPatchConfiguration = context.config();
--            RandomSource randomSource = context.random();
--            SculkSpreader sculkSpreader = SculkSpreader.createWorldGenSpreader();
--            int i = sculkPatchConfiguration.spreadRounds() + sculkPatchConfiguration.growthRounds();
--
--            for(int j = 0; j < i; ++j) {
--                for(int k = 0; k < sculkPatchConfiguration.chargeCount(); ++k) {
--                    sculkSpreader.addCursors(blockPos, sculkPatchConfiguration.amountPerCharge());
--                }
--
--                boolean bl = j < sculkPatchConfiguration.spreadRounds();
--
--                for(int l = 0; l < sculkPatchConfiguration.spreadAttempts(); ++l) {
--                    sculkSpreader.updateCursors(worldGenLevel, blockPos, randomSource, bl);
--                }
--
--                sculkSpreader.clear();
--            }
--
--            BlockPos blockPos2 = blockPos.below();
--            if (randomSource.nextFloat() <= sculkPatchConfiguration.catalystChance() && worldGenLevel.getBlockState(blockPos2).isCollisionShapeFullBlock(worldGenLevel, blockPos2)) {
--                worldGenLevel.setBlock(blockPos, Blocks.SCULK_CATALYST.defaultBlockState(), 3);
--            }
--
--            int m = sculkPatchConfiguration.extraRareGrowths().sample(randomSource);
--
--            for(int n = 0; n < m; ++n) {
--                BlockPos blockPos3 = blockPos.offset(randomSource.nextInt(5) - 2, 0, randomSource.nextInt(5) - 2);
--                if (worldGenLevel.getBlockState(blockPos3).isAir() && worldGenLevel.getBlockState(blockPos3.below()).isFaceSturdy(worldGenLevel, blockPos3.below(), Direction.UP)) {
--                    worldGenLevel.setBlock(blockPos3, Blocks.SCULK_SHRIEKER.defaultBlockState().setValue(SculkShriekerBlock.CAN_SUMMON, Boolean.valueOf(true)), 3);
--                }
--            }
--
--            return true;
--        }
--    }
-+    public boolean place(FeaturePlaceContext<SculkPatchConfiguration> context) { return false; }
- 
-     private boolean canSpreadFrom(LevelAccessor world, BlockPos pos) {
-         BlockState blockState = world.getBlockState(pos);

patches/server/0036-Biome-freeze-override.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 29 Aug 2023 09:23:11 -0500
-Subject: [PATCH] Biome freeze override
-
-
-diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index 65012a12e1430956ef55ced56773e6354ac26444..0178017cb2d871dd344e3da910ee724cac05d7e5 100644
---- a/src/main/java/net/minecraft/world/level/biome/Biome.java
-+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -76,6 +76,7 @@ public final class Biome {
-             return long2FloatLinkedOpenHashMap;
-         });
-     });
-+    public Boolean canFreeze = null; // Slice
- 
-     Biome(Biome.ClimateSettings weather, BiomeSpecialEffects effects, BiomeGenerationSettings generationSettings, MobSpawnSettings spawnSettings) {
-         this.climateSettings = weather;
-@@ -138,6 +139,8 @@ public final class Biome {
-     }
- 
-     public boolean shouldFreeze(LevelReader world, BlockPos pos, boolean doWaterCheck) {
-+        if (canFreeze != null) return canFreeze; // Slice
-+
-         if (this.warmEnoughToRain(pos)) {
-             return false;
-         } else {

patches/server/0037-Change-KeepAlive-interval.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Tue, 3 Oct 2023 09:18:59 -0500
-Subject: [PATCH] Change KeepAlive interval
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42e61e55ef45935e1f690eefa56bc36842cdd974..049c1417968d89ba7b6208339e4a812bc72e007b 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -409,7 +409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                 this.disconnect(Component.translatable("disconnect.timeout", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-             }
-         } else {
--            if (elapsedTime >= 15000L) { // 15 seconds
-+            if (elapsedTime >= 5000L) { // 15 seconds // Slice -> 5s
-                 this.keepAlivePending = true;
-                 this.keepAliveTime = currentTime;
-                 this.keepAliveChallenge = currentTime;

patches/server/0038-Non-saveable-entities.patch

@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sat, 21 Oct 2023 11:27:52 -0500
-Subject: [PATCH] Non-saveable entities
-
-
-diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-index 7e8dc9e8f381abfdcce2746edc93122d623622d1..303e5ed4d5cf2a64b998656bfd189f19f8c8fcde 100644
---- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-+++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-@@ -118,7 +118,7 @@ public final class ChunkEntitySlices {
-                 // removed by us below
-                 continue;
-             }
--            if (entity.shouldBeSaved()) {
-+            if (entity.shouldBeSaved() || !entity.saveable) { // Slice
-                 entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK);
-                 if (entity.isVehicle()) {
-                     // we cannot assume that these entities are contained within this chunk, because entities can
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b23b6be85496d031b81b2d3abb9690322c340a80..eb2ef004860c89fba346c8025ae3c645106a21e6 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -418,6 +418,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
-     public boolean collidingWithWorldBorder; // Paper
-     public boolean fixedPose = false; // Paper
-+    public boolean saveable = true; // Slice
- 
-     public void setOrigin(@javax.annotation.Nonnull Location location) {
-         this.origin = location.toVector();
-@@ -4703,7 +4704,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     @Override
-     public boolean shouldBeSaved() {
--        return this.removalReason != null && !this.removalReason.shouldSave() ? false : (this.isPassenger() ? false : !this.isVehicle() || !this.hasAnyPlayerPassengers()); // Paper - rewrite chunk system - it should check if the entity has ANY player passengers
-+        return this.saveable && this.removalReason != null && !this.removalReason.shouldSave() ? false : (this.isPassenger() ? false : !this.isVehicle() || !this.hasAnyPlayerPassengers()); // Paper - rewrite chunk system - it should check if the entity has ANY player passengers // Slice - add saveable check
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2dbe8b870fd39b4d22e9725912f443757ae70761..0cc2d78c68c87c7dce3fbd40f5ba946d7776daa0 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1507,4 +1507,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         return this.getHandle().getScoreboardName();
-     }
-     // Paper end - entity scoreboard name
-+
-+    // Slice start
-+    @Override
-+    public boolean isSaveable() {
-+        return this.entity.saveable;
-+    }
-+
-+    @Override
-+    public void setSaveable(boolean saveable) {
-+        this.entity.saveable = saveable;
-+    }
-+    // Slice end
- }

patches/server/0039-ChunkStatusChangeEvent.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Sun, 22 Oct 2023 08:41:08 -0500
-Subject: [PATCH] ChunkStatusChangeEvent
-
-
-diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
-index 51304c5cf4b0ac7646693ef97ef4a3847d3342b5..21976eeda150d3d7e396ebabdf6416dd65560dbd 100644
---- a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
-+++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
-@@ -1324,6 +1324,13 @@ public final class NewChunkHolder {
-                 // chunks cannot downgrade state while status is pending a change
-                 final LevelChunk chunk = (LevelChunk)this.currentChunk;
- 
-+                // Slice start
-+                new com.destroystokyo.paper.event.chunk.ChunkStatusChangeEvent(new org.bukkit.craftbukkit.CraftChunk(chunk),
-+                        com.destroystokyo.paper.event.chunk.ChunkStatusChangeEvent.ChunkStatus.valueOf(currState.name()),
-+                        com.destroystokyo.paper.event.chunk.ChunkStatusChangeEvent.ChunkStatus.valueOf(nextState.name()))
-+                        .callEvent();
-+                // Slice end
-+
-                 // Note: we assume that only load/unload contain plugin logic
-                 // plugin logic is anything stupid enough to possibly change the chunk status while it is already
-                 // being changed (i.e during load it is possible it will try to set to full ticking)

patches/server/0040-Disable-sending-Entity-Movement-Packets.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Wed, 25 Oct 2023 17:05:29 -0500
-Subject: [PATCH] Disable sending Entity Movement Packets
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 0ac580f3cf8f95025992420702d67ad56db2ba05..676427c69ab445cef3a81628ed34cb6d4f018e8e 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -148,7 +148,7 @@ public class ServerEntity {
-                 boolean flag = Math.abs(i - this.yRotp) >= 1 || Math.abs(j - this.xRotp) >= 1;
- 
-                 if (flag) {
--                    this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround()));
-+                    if (entity.sendMovementPackets) this.broadcast.accept(new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround())); // Slice
-                     this.yRotp = i;
-                     this.xRotp = j;
-                 }
-@@ -183,14 +183,14 @@ public class ServerEntity {
-                     if (!flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.onGround()&& !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
-                         if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
-                             if (flag2) {
--                                packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround());
-+                                if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround()); // Slice
-                                 flag4 = true;
-                             } else if (flag3) {
--                                packet1 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround());
-+                                if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), (byte) i, (byte) j, this.entity.onGround()); // Slice
-                                 flag5 = true;
-                             }
-                         } else {
--                            packet1 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), (byte) i, (byte) j, this.entity.onGround());
-+                            if (entity.sendMovementPackets) packet1 = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), (byte) i, (byte) j, this.entity.onGround()); // Slice
-                             flag4 = true;
-                             flag5 = true;
-                         }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb2ef004860c89fba346c8025ae3c645106a21e6..c955bbc0348dad7ffd4bcc3a5fa17f0de6f1aed6 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     public boolean collidingWithWorldBorder; // Paper
-     public boolean fixedPose = false; // Paper
-     public boolean saveable = true; // Slice
-+    public boolean sendMovementPackets = true; // Slice
- 
-     public void setOrigin(@javax.annotation.Nonnull Location location) {
-         this.origin = location.toVector();

patches/server/0041-Player-spawnsOwnMobs.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Thu, 7 Dec 2023 08:48:41 -0600
-Subject: [PATCH] Player spawnsOwnMobs
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index acbcdc8cb1523044b1657e03a141fae6389a3686..000a2c8d30d7d72a460e2fc6205088b81a8bfe3a 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -521,7 +521,7 @@ public class ServerChunkCache extends ChunkSource {
-             // Paper start - optimize isOutisdeRange
-             ChunkMap playerChunkMap = this.chunkMap;
-             for (ServerPlayer player : this.level.players) {
--                if (!player.affectsSpawning || player.isSpectator()) {
-+                if (!player.affectsSpawning || player.isSpectator() || player.spawnsOwnMobs) { // Slice
-                     playerChunkMap.playerMobSpawnMap.remove(player);
-                     continue;
-                 }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 564591e9f18dd6bb0f76ae4f153adcc0a228d4fa..578535732d442b524536bdd76d6a4badeed84fbd 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -770,7 +770,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         // Paper start - optimise checkDespawn
-         this.playersAffectingSpawning.clear();
-         for (ServerPlayer player : this.players) {
--            if (net.minecraft.world.entity.EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) {
-+            if (!player.spawnsOwnMobs && net.minecraft.world.entity.EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) { // Slice
-                 this.playersAffectingSpawning.add(player);
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 15515e871c89498ec936ab24871741f883f18a3b..16fbdbe12d54fbc8d54403979ee2a89322a14dd2 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -188,6 +188,8 @@ public abstract class Player extends LivingEntity {
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
-     // Paper end
- 
-+    public boolean spawnsOwnMobs = false; // Slice
-+
-     // CraftBukkit start
-     public boolean fauxSleeping;
-     public int oldLevel = -1;

patches/server/0042-Set-location-on-a-Custom-Inventory.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cryptite <cryptite@gmail.com>
-Date: Fri, 8 Dec 2023 08:02:07 -0600
-Subject: [PATCH] Set location on a Custom Inventory
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-index da1c1fe0faf6819b15a81d6ad53370948e5f984f..84eff85e98484c9701e203bb1fa61435ee88bab4 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-@@ -69,6 +69,14 @@ public class CraftInventoryCustom extends CraftInventory {
-     }
-     // Paper end
- 
-+    // Slice start
-+    public void setLocation(Location location) {
-+        if (this.inventory instanceof MinecraftInventory minecraftInventory) {
-+            minecraftInventory.location = location;
-+        }
-+    }
-+    // Slice end
-+
-     static class MinecraftInventory implements Container {
-         private final NonNullList<ItemStack> items;
-         private int maxStack = MAX_STACK;
-@@ -77,6 +85,7 @@ public class CraftInventoryCustom extends CraftInventory {
-         private final net.kyori.adventure.text.Component adventure$title; // Paper
-         private InventoryType type;
-         private final InventoryHolder owner;
-+        private Location location; // Slice
- 
-         // Paper start
-         public MinecraftInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) {
-@@ -239,7 +248,7 @@ public class CraftInventoryCustom extends CraftInventory {
- 
-         @Override
-         public Location getLocation() {
--            return null;
-+            return location;
-         }
- 
-         // Paper start