From bde00fb532d83ef9b4d3acb1219d32e51cd4e6f5 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Tue, 26 Jul 2022 00:30:19 -0500
Subject: [PATCH] https://media.skyline.to/kc1VHYJwg2.png

---
 patches/server/0001-Build-changes.patch                     | 6 +++---
 ...emEntity-Check-if-items-are-air-before-calling-set.patch | 4 ++--
 ...lidate-coordinates-before-attempting-to-get-block-.patch | 6 +++---
 patches/server/0032-Add-spectator-teleport-event.patch      | 4 ++--
 patches/server/0033-Prevent-invalid-container-events.patch  | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index cc61964..0947bdf 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -49,10 +49,10 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..fc08b27f5c8a8e2ec96cb8b28e5e2c79
      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 a934226dc9a273fac03c21227f7ef3d50ea080c4..0b161ef08479930345b84fec917ddb1c46f8474b 100644
+index 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..7e6be11d7ec1f3d52dcc632dc8c16ee023682278 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -62,7 +62,7 @@ index a934226dc9a273fac03c21227f7ef3d50ea080c4..0b161ef08479930345b84fec917ddb1c
  
      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 a8cf1ab9d7504dfdb2310f1dca82324a225bea7d..23ba68c2af8512b51b635f373551d1bcd649a7f3 100644
+index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..10eecebce5eb8f9f062a10e9cbfbadbc54aec9b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch
index 2f8147a..653337f 100644
--- a/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch
+++ b/patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemEntity - Check if items are air before calling setItem
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ae4b251e10babb07055d031ff48ac7dd5d4be4a0..36d57256c50fbd5e60c755ea47b608137d92ea50 100644
+index c58c296bbb0fbd1930dba38bcab7ec3103917ba5..3c9df100ce8656d93deb3a6a2bb06abc9b30916b 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -385,11 +385,14 @@ public class ItemEntity extends Entity {
+@@ -390,11 +390,14 @@ public class ItemEntity extends Entity {
  
          CompoundTag nbttagcompound1 = nbt.getCompound("Item");
  
diff --git a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch
index 6f1b4fc..4228ba4 100644
--- a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch
+++ b/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 630a762b71861bfe21c47a11d4fe05e1a3b7d339..f13b4e880c179e4f6e76cc0a2655b9f148a08290 100644
+index 935c482be4bf3767e197a576d0e38eac51115dd4..ff31e7de543ee82e01b7d80382874732314504d6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1837,6 +1837,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1843,6 +1843,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      }
      // Spigot end
  
@@ -28,7 +28,7 @@ index 630a762b71861bfe21c47a11d4fe05e1a3b7d339..f13b4e880c179e4f6e76cc0a2655b9f1
      @Override
      public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3182,15 +3194,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3188,15 +3200,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
                  BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
                  // Paper start
diff --git a/patches/server/0032-Add-spectator-teleport-event.patch b/patches/server/0032-Add-spectator-teleport-event.patch
index 99b9251..4baa8f1 100644
--- a/patches/server/0032-Add-spectator-teleport-event.patch
+++ b/patches/server/0032-Add-spectator-teleport-event.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1416ab1cf80b53db1bc0f1485777b74cdb6bcf59..d053c7547db965cd103a6edf56916f3c6e98a673 100644
+index ff31e7de543ee82e01b7d80382874732314504d6..68c9de9121d9e60e509b38b5e866d87d3782bd6a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index 1416ab1cf80b53db1bc0f1485777b74cdb6bcf59..d053c7547db965cd103a6edf56916f3c
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
  import com.mojang.brigadier.ParseResults;
-@@ -1979,6 +1980,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1985,6 +1986,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  Entity entity = packet.getEntity(worldserver);
  
                  if (entity != null) {
diff --git a/patches/server/0033-Prevent-invalid-container-events.patch b/patches/server/0033-Prevent-invalid-container-events.patch
index ceed382..afc520f 100644
--- a/patches/server/0033-Prevent-invalid-container-events.patch
+++ b/patches/server/0033-Prevent-invalid-container-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7c6fceb410f6b8683795a0a967dfe3305a689e26..1851a9eaf0ea56434d9b96c7c829ee5411f666fe 100644
+index 68c9de9121d9e60e509b38b5e866d87d3782bd6a..578568d841174b0d4adfda1916d30ac979df4b62 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -31,6 +31,8 @@ import java.util.function.UnaryOperator;
@@ -17,7 +17,7 @@ index 7c6fceb410f6b8683795a0a967dfe3305a689e26..1851a9eaf0ea56434d9b96c7c829ee54
  import net.minecraft.ChatFormatting;
  import net.minecraft.CrashReport;
  import net.minecraft.CrashReportCategory;
-@@ -2840,6 +2842,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2846,6 +2848,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleContainerClick(ServerboundContainerClickPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
@@ -25,7 +25,7 @@ index 7c6fceb410f6b8683795a0a967dfe3305a689e26..1851a9eaf0ea56434d9b96c7c829ee54
          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
-@@ -2859,6 +2862,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2865,6 +2868,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          return;
                      }