bale o' patches

patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch

@@ -9,10 +9,10 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 30d79e006f22a6cc7652b111b9307f9f1634ba60..b079f9cd9dd3c818b859010df74172a84eee544d 100644
+index db3874f683f19ef4ae2b5e02e08c5c000ae90661..aff3c2020a604942b5ba407156ebf5953ffa0377 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3719,6 +3719,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3752,6 +3752,7 @@ public abstract class LivingEntity extends Entity {
                          level.getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {

patches/server/0615-Add-bypass-host-check.patch

@@ -8,18 +8,18 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 8060d6461835d5b5b4429e9b280d08eae4e435e9..f74b6d2110e51c76eeb1aea7665153509b6e6371 100644
+index ec98a6540a7c4d032234dea5148adaccff7298b9..a54bb43a3acf31be0278fee3d23de9acfdfc64cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-@@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
+@@ -29,6 +29,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
-     private static final Component IGNORE_STATUS_REASON = new TextComponent("Ignoring status request");
+     private static final Component IGNORE_STATUS_REASON = Component.literal("Ignoring status request");
      private final MinecraftServer server;
      private final Connection connection;
 +    private static final boolean BYPASS_HOSTCHECK = Boolean.getBoolean("Paper.bypassHostCheck"); // Paper
  
      public ServerHandshakePacketListenerImpl(MinecraftServer server, Connection connection) {
          this.server = server;
-@@ -118,7 +119,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
+@@ -117,7 +118,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
                      if (!handledByEvent && proxyLogicEnabled) {
                          // Paper end
                      // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!

patches/server/0616-Set-area-affect-cloud-rotation.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index cd359e6576e69184935b0852ffc6b9fb57181730..57b8c02dc8466dfc572719d72c9ff1fdefbbca4c 100644
+index bb5d22125b6cd4e60d2b7e2e00af158c9ea22cd9..84d84ceda1855bd1d11b2917c16fdb845a7600fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -894,6 +894,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+@@ -919,6 +919,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
              entity.moveTo(location.getX(), location.getY(), location.getZ());
          } else if (AreaEffectCloud.class.isAssignableFrom(clazz)) {
              entity = new net.minecraft.world.entity.AreaEffectCloud(world, x, y, z);

patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch

@@ -5,15 +5,15 @@ Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 18eff3a00ae5137ec71c31bc3466a864c60d9fde..888e1f2bc6ea4ddbbcc5466f177233f25b290459 100644
+index 9a40839ccedd6a39c2b8755e29f31a4f626fe15d..4977f3fad3bfc12fd4c5f9fbe8beea2895247c57 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -348,7 +348,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -363,7 +363,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
                  if (blockEntity.isLit() && furnaceBurnEvent.isBurning()) {
                      // CraftBukkit end
                      flag1 = true;
--                    if (!itemstack.isEmpty()) {
+-                    if (flag3) {
-+                    if (!itemstack.isEmpty() && furnaceBurnEvent.willConsumeFuel()) { // Paper
++                    if (flag3 && furnaceBurnEvent.willConsumeFuel()) { // Paper
                          Item item = itemstack.getItem();
  
                          itemstack.shrink(1);

patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] fix PigZombieAngerEvent cancellation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 31595c3a225c14f7cab4ab1b50c9905f8dae09a3..6fe49abb9d9a273787828e72061e16a7b053e50a 100644
+index 58d49da3f95f8cd5d61da199ddba1100c411276e..d0567234d1261227d29bb254f959604dc91b3c72 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -52,6 +52,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {

patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bd40af954458ec9ff0ccbf30cb943a1b0a3054fa..94829dd595147b2f251094835d9a7ba3b87484c0 100644
+index 34153902ac86ce6c518a840717f6bb099f45ea1f..9ff10dd4013840c5021ce178c2804ee5b09902ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1985,6 +1985,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {

patches/server/0623-Added-PlayerDeepSleepEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Added PlayerDeepSleepEvent
 
 
 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 49648e258c6e72ac921f69114e1e36a926749d46..de0b885ebafecb37ef8be127362f76d487ff92ae 100644
+index fba9636e670300e31b5348de9cf3bc23e0eb6e6a..3ed54b50e7d1b88cd5fc63d22906dfb2dc17a478 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -246,6 +246,11 @@ public abstract class Player extends LivingEntity {
+@@ -256,6 +256,11 @@ public abstract class Player extends LivingEntity {
  
          if (this.isSleeping()) {
              ++this.sleepCounter;

patches/server/0624-More-World-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6777b678efebc5eee72b2aa368309aea3191157f..07c90f6a98819c835b2341bd5c144609655b33e7 100644
+index 0440a9e3449cdf1a969ba8c7863b73842afebe48..a56071592420f9b649c84437fff336b03d6c93ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1967,6 +1967,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0625-Added-PlayerBedFailEnterEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerBedFailEnterEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index 67b677af9a798b4889d1e231c3af448a087eb3d8..20c0030d566012146021613325c6a979f392740e 100644
+index 006541834811c20fbdef42d4ad299da1dc046d33..654a859a37bf991c7a7fa8a44a3d20f8feb223db 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
 @@ -110,14 +110,23 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
@@ -25,7 +25,7 @@ index 67b677af9a798b4889d1e231c3af448a087eb3d8..20c0030d566012146021613325c6a979
                          this.explodeBed(finaliblockdata, world, finalblockposition);
                      } else
                      // CraftBukkit end
-                     if (entityhuman_enumbedresult != null) {
+                     if (entityhuman_enumbedresult.getMessage() != null) {
 -                        player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
 +                        final net.kyori.adventure.text.Component message = event.getMessage(); // Paper
 +                        if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper

patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch

@@ -42,10 +42,10 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a97e4ac808ed746c5e6bbcbe90839beb00c57c52..fa6adf12e8272c90c3376bc93350dc57eb1cd461 100644
+index ec24ec2000124465b18b204828486ca3f3eb051c..949e2050dae9048f53cd5b8452763be5fbd70958 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -223,6 +223,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -216,6 +216,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          com.destroystokyo.paper.PaperConfig.registerCommands();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.

patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7eafebf167e4060c73ba77636eb11e7f346f040a..3e6f38e9b42f086c3f8b020628683f06ba1d28cb 100644
+index f97583b667854cfcb1a25eda844492a03d327a76..9ebfa6940a5e9a1a9e396d3b0de1ddf4fc85d43c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -851,6 +851,7 @@ public abstract class PlayerList {

patches/server/0628-Introduce-beacon-activation-deactivation-events.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Introduce beacon activation/deactivation events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 82976b3675f581a9f3ccb9e23048bd44864203f8..8d5c9813010a0256bd2712a1eabbc91f0f473a41 100644
+index 812d21393ed2ed0623b7445585f1b0b3dcefb55d..5f6eeb36f57bd342b18590c8f0ffb668d2bf273c 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -204,6 +204,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
+@@ -210,6 +210,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
                  BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
              }
          }
@@ -24,7 +24,7 @@ index 82976b3675f581a9f3ccb9e23048bd44864203f8..8d5c9813010a0256bd2712a1eabbc91f
  
          if (blockEntity.lastCheckY >= l) {
              blockEntity.lastCheckY = world.getMinBuildHeight() - 1;
-@@ -261,6 +270,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
+@@ -267,6 +276,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
  
      @Override
      public void setRemoved() {

patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94829dd595147b2f251094835d9a7ba3b87484c0..f80a39acd2df8181523549d53664d7008638122d 100644
+index 9ff10dd4013840c5021ce178c2804ee5b09902ca..0c2ad9c0f97e90df7ea32cf58d4e8b7a16eb609e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2502,7 +2502,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2673,7 +2673,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
@@ -18,7 +18,7 @@ index 94829dd595147b2f251094835d9a7ba3b87484c0..f80a39acd2df8181523549d53664d700
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3e6f38e9b42f086c3f8b020628683f06ba1d28cb..6dfca5731966084efce3997898a6ebe9c0c6ea0d 100644
+index 9ebfa6940a5e9a1a9e396d3b0de1ddf4fc85d43c..11b5335a7f30113da58c39aa15ca5e6f0b2588d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -810,6 +810,12 @@ public abstract class PlayerList {

patches/server/0630-Add-Channel-initialization-listeners.patch

@@ -106,10 +106,10 @@ index 0000000000000000000000000000000000000000..30e62719e0a83525daa33cf41cb61df3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 888e863b6d605bf587d0c071795a43d2157afa4d..c36089ead51d2e7dc3369d5f9a1869f58ff5391c 100644
+index 72fbc58f7d003b7af3c35e5fc504010307c7086b..076c1d5fb69a4a30b3e412e85b17db09fd9a1def 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -112,6 +112,7 @@ public class ServerConnectionListener {
+@@ -113,6 +113,7 @@ public class ServerConnectionListener {
                      pending.add((Connection) object); // Paper
                      channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
                      ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));

patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Send empty commands if tab completion is disabled
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e195ef979984ea7ffe4558c42ebabadf2a00950a..8f51b814c5b1c2c14378565363119df45af25726 100644
+index 2dc41adc4e915f98451d79f0826b75560b716d21..f34e8f5b6837473b5aef96fea89ec7564a86f430 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -345,7 +345,12 @@ public class Commands {
+@@ -348,7 +348,12 @@ public class Commands {
      }
  
      public void sendCommands(ServerPlayer player) {

patches/server/0633-Add-EntityBlockStorage-clearEntities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityBlockStorage#clearEntities()
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index e4e879cdfe7d257161bf8e98305c0f2e9b9539f9..19127ec5d89235ea9af549810b24783e0af85a3d 100644
+index ea63802f2644bc2b5b3b0c72d7d09813cb68139d..82ad97800cb115cc4830337a59cc4608c1d4a7a0 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -138,6 +138,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity {
          return this.stored.size();
      }
  

patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch

@@ -5,27 +5,27 @@ Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 8096f01fa7f1ed73e4812912fc9b21bafdd212c8..b16287a47870978706734b928b87f2357e91e3a1 100644
+index a4f2eb219cc57303cc6642e6782700591e423cf4..de0513b38e5fa0138f1cee6bb633561be12449fc 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -290,10 +290,18 @@ public class PlayerAdvancements {
+@@ -289,10 +289,18 @@ public class PlayerAdvancements {
              this.progressChanged.add(advancement);
              flag = true;
              if (!flag1 && advancementprogress.isDone()) {
 -                this.player.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
 +                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
 +                boolean announceToChat = advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat();
-+                net.kyori.adventure.text.Component message = announceToChat ? io.papermc.paper.adventure.PaperAdventure.asAdventure(new TranslatableComponent("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent())) : null;
++                net.kyori.adventure.text.Component message = announceToChat ? io.papermc.paper.adventure.PaperAdventure.asAdventure(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent())) : null;
 +                org.bukkit.event.player.PlayerAdvancementDoneEvent event = new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit, message);
 +                this.player.level.getCraftServer().getPluginManager().callEvent(event);
 +                message = event.message();
 +                // Paper end
                  advancement.getRewards().grant(this.player);
 -                if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
--                    this.playerList.broadcastMessage(new TranslatableComponent("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), new Object[]{this.player.getDisplayName(), advancement.getChatComponent()}), ChatType.SYSTEM, Util.NIL_UUID);
+-                    this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), ChatType.SYSTEM);
 +                // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
 +                if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                    this.playerList.broadcastMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM, Util.NIL_UUID);
++                    this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM);
 +                    // Paper end
                  }
              }

patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ab21f25a3eb0575d08aeac717ba2b74160f54fa9..4e23e9ac3579dd0cedf0dfdbb231f6fae111745c 100644
+index 8da6770f88ce693251812f3c0a803a09286e56ad..ffbd711375c400c9faaa4c984463a24af2f4993f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -355,12 +355,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -415,12 +415,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
                              // Paper end
                          String playerName = ServerLoginPacketListenerImpl.this.gameProfile.getName();
                          java.net.InetAddress address = ((java.net.InetSocketAddress) ServerLoginPacketListenerImpl.this.connection.getRemoteAddress()).getAddress();

patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] call PortalCreateEvent players and end platform
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d5df57d0692f26420fba8ca25c302dfcd9078e20..c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab 100644
+index e37bf6844a3cdc85c51787b865f0f37ce70dfaa2..1b37b428f7692020473f229eb2c9049b65bd1351 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1200,15 +1200,21 @@ public class ServerPlayer extends Player {
+@@ -1209,15 +1209,21 @@ public class ServerPlayer extends Player {
      private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
  

patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index ecf12ed5014202181e78af051e4a9ca88a275794..e23fe546291e670f89447398507d08a0a07efa85 100644
+index 5f679d5f148e59376669a5faa970961df219fe35..e5bb1baa22db202a6d17ef639bc4940ed1605337 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -96,9 +96,15 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -97,9 +97,15 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          return MobType.UNDEAD;
      }
  
@@ -26,7 +26,7 @@ index ecf12ed5014202181e78af051e4a9ca88a275794..e23fe546291e670f89447398507d08a0
  
          if (flag) {
              ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-@@ -222,7 +228,20 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -225,7 +231,20 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.reassessWeaponGoal();

patches/server/0640-Add-basic-Datapack-API.patch

@@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6fa21f806567bc41bacd2949d7171979bc34ac6e..90b0673411d33f46ac959c31f0608c489d41c3bb 100644
+index 524d04e8ee8645909b88ab32e044131d3cabea4e..eb2d4225eea2940bc9091daf7d7aa96fc8cab675 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -281,6 +281,7 @@ public final class CraftServer implements Server {
+@@ -276,6 +276,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;
@@ -103,7 +103,7 @@ index 6fa21f806567bc41bacd2949d7171979bc34ac6e..90b0673411d33f46ac959c31f0608c48
      public static Exception excessiveVelEx; // Paper - Velocity warnings
  
      static {
-@@ -362,6 +363,7 @@ public final class CraftServer implements Server {
+@@ -357,6 +358,7 @@ public final class CraftServer implements Server {
          TicketType.PLUGIN.timeout = Math.min(20, this.configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second
          this.minimumAPI = this.configuration.getString("settings.minimum-api");
          this.loadIcon();
@@ -111,7 +111,7 @@ index 6fa21f806567bc41bacd2949d7171979bc34ac6e..90b0673411d33f46ac959c31f0608c48
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2749,5 +2751,11 @@ public final class CraftServer implements Server {
+@@ -2732,5 +2734,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }

patches/server/0641-Add-environment-variable-to-disable-server-gui.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 11ed386c6358e55fe5c0e5e8496fa7f7c663a7e2..69dc1271be0a3f3f2fb4ce15981ed25d24dce785 100644
+index 3d8449a91687f2637a6254bafd378707e810d769..9ebfa8c8a3fc1299e513efd467c562459f2684e7 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -272,6 +272,7 @@ public class Main {
+@@ -268,6 +268,7 @@ public class Main {
                  */
                  boolean flag1 = !optionset.has("nogui") && !optionset.nonOptionArguments().contains("nogui");
  

patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] additions to PlayerGameModeChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
-index d25a27f3a6775ca86092ea8bdeab4abdd8909d35..7d9ec435f3821f95d3bed893c4e46d5a2531cd58 100644
+index d446e52aa0951af5f759fa7a91908f4d818bd4a5..3fcdc509649b3d67bfd74404bcdf8d7a65c1babf 100644
 --- a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
 +++ b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java
 @@ -31,9 +31,13 @@ public class DefaultGameModeCommands {
@@ -25,10 +25,10 @@ index d25a27f3a6775ca86092ea8bdeab4abdd8909d35..7d9ec435f3821f95d3bed893c4e46d5a
          }
  
 diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b937252e0 100644
+index 65089c0e78c9913a92ae9c66d664f48e2112ad92..7882ee2b7813d437d3b7580f046f38e79fc9e7b6 100644
 --- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-@@ -52,9 +52,14 @@ public class GameModeCommand {
+@@ -50,9 +50,14 @@ public class GameModeCommand {
          int i = 0;
  
          for(ServerPlayer serverPlayer : targets) {
@@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab..045729440899e59bd023b3e84ef11f4d6682d10b 100644
+index 1b37b428f7692020473f229eb2c9049b65bd1351..d78de27793ffca39a256accecd5033860ac23d1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1809,8 +1809,15 @@ public class ServerPlayer extends Player {
+@@ -1811,8 +1811,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab..045729440899e59bd023b3e84ef11f4d
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1822,7 +1829,7 @@ public class ServerPlayer extends Player {
+@@ -1824,7 +1831,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab..045729440899e59bd023b3e84ef11f4d
          }
      }
  
-@@ -2204,6 +2211,16 @@ public class ServerPlayer extends Player {
+@@ -2230,6 +2237,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
@@ -93,10 +93,10 @@ index c9d70d5d1b53fe92ca7d895f1ed0d82fe4b06dab..045729440899e59bd023b3e84ef11f4d
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f97d97426144527cff9ebb91b26fe8541a9c6d9b..b6eef41079120fffd63f06f681378b1b628b95e0 100644
+index 06e7a8b8227260c002a88119544b99a11eec8a09..4d907501dfe7f1a4641542291f4abdd05cb1644c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -74,18 +74,24 @@ public class ServerPlayerGameMode {
+@@ -73,18 +73,24 @@ public class ServerPlayerGameMode {
      }
  
      public boolean changeGameModeForPlayer(GameType gameMode) {
@@ -126,10 +126,10 @@ index f97d97426144527cff9ebb91b26fe8541a9c6d9b..b6eef41079120fffd63f06f681378b1b
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f80a39acd2df8181523549d53664d7008638122d..4f7cd9209cf6c352817591dd497c2e7ec6265ac6 100644
+index 0c2ad9c0f97e90df7ea32cf58d4e8b7a16eb609e..3009ff5a0edf8acf6f2c9285af3c6f3ee2c78b1a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2511,7 +2511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2682,7 +2682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                      this.player = this.server.getPlayerList().respawn(this.player, false);
                      if (this.server.isHardcore()) {
@@ -139,10 +139,10 @@ index f80a39acd2df8181523549d53664d7008638122d..4f7cd9209cf6c352817591dd497c2e7e
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 047411e24a53c2e625c05b7079406060024e5dc9..e80268801518b1cbdec69a09ea571af0f2cf5492 100644
+index 91027504dd2963806ec52f773fc768a1288e15f2..3f19ff22ecbc012b9432bd2e25fb3dcec4a56979 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1380,7 +1380,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1377,7 +1377,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalArgumentException("Mode cannot be null");
          }
  

patches/server/0643-ItemStack-repair-check-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 209ad4d73e7ac0c76600a4c68d9473765f09c240..9a98097f2d6beb6e7125ac5a7a2d60747d143a36 100644
+index a74efa4a5888f090d04f6cac57bee98f1132ebe7..54184e94a3516c2be27c39951efee28b45160284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -537,6 +537,14 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0644-More-Enchantment-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] More Enchantment API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index c536eceef3365a7b726cd970df345ba1d055207d..11c1eb0e0bc326b28dc0cab16f67c413cc52e98c 100644
+index 9bc659a7ab2030e851c85ca511fbba51998563bf..d94ca202033edff679d9471cb33a314735f57be7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
 @@ -71,7 +71,7 @@ public class CraftEnchantment extends Enchantment {
@@ -17,7 +17,7 @@ index c536eceef3365a7b726cd970df345ba1d055207d..11c1eb0e0bc326b28dc0cab16f67c413
      }
  
      @Override
-@@ -197,6 +197,45 @@ public class CraftEnchantment extends Enchantment {
+@@ -199,6 +199,45 @@ public class CraftEnchantment extends Enchantment {
      public String translationKey() {
          return this.target.getDescriptionId();
      }