From ae4eca6fd1f1c25b61e1edcda0e5fb6db2054cc3 Mon Sep 17 00:00:00 2001
From: TrollyLoki <trollyloki@gmail.com>
Date: Sun, 29 Oct 2023 11:10:00 -0400
Subject: [PATCH] Rebase

---
 ... => 0449-Add-raw-byte-block-state-serialization.patch} | 0
 ... => 1052-Add-raw-byte-block-state-serialization.patch} | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename patches/api/{0442-Add-raw-byte-block-state-serialization.patch => 0449-Add-raw-byte-block-state-serialization.patch} (100%)
 rename patches/server/{1040-Add-raw-byte-block-state-serialization.patch => 1052-Add-raw-byte-block-state-serialization.patch} (94%)

diff --git a/patches/api/0442-Add-raw-byte-block-state-serialization.patch b/patches/api/0449-Add-raw-byte-block-state-serialization.patch
similarity index 100%
rename from patches/api/0442-Add-raw-byte-block-state-serialization.patch
rename to patches/api/0449-Add-raw-byte-block-state-serialization.patch
diff --git a/patches/server/1040-Add-raw-byte-block-state-serialization.patch b/patches/server/1052-Add-raw-byte-block-state-serialization.patch
similarity index 94%
rename from patches/server/1040-Add-raw-byte-block-state-serialization.patch
rename to patches/server/1052-Add-raw-byte-block-state-serialization.patch
index 96b962852..2d6ba8d79 100644
--- a/patches/server/1040-Add-raw-byte-block-state-serialization.patch
+++ b/patches/server/1052-Add-raw-byte-block-state-serialization.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add raw byte block state serialization
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-index e3b07d623cd64de9645f2372f1e08757edc1a9ed..0046a230aa1331736f7e282c872528d19796fc17 100644
+index 9271ff2a9ea05569e3c81886399aa7ab47efb05d..78234964c1e2107ff73d4f31b060ca6a5c38ea27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
-@@ -231,13 +231,18 @@ public final class CraftBlockStates {
+@@ -235,13 +235,18 @@ public final class CraftBlockStates {
          return CraftBlockStates.getBlockState(block, true);
      }
      public static BlockState getBlockState(Block block, boolean useSnapshot) {
@@ -30,10 +30,10 @@ index e3b07d623cd64de9645f2372f1e08757edc1a9ed..0046a230aa1331736f7e282c872528d1
          boolean prev = CraftBlockEntityState.DISABLE_SNAPSHOT;
          CraftBlockEntityState.DISABLE_SNAPSHOT = !useSnapshot;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6b31f88803041c75023a2c99bdc1efd902f0205c..9bbaf03775d60361fda21161a88f7712f27e626e 100644
+index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..866d1f5cee46594475717b247902b8832bcb315b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -519,6 +519,42 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -526,6 +526,42 @@ public final class CraftMagicNumbers implements UnsafeValues {
              .orElseThrow(() -> new IllegalArgumentException("An ID was not found for the data. Did you downgrade?")).getBukkitEntity();
      }