rebuild patches

Author: Lulu13022002

…Eigencraft-redstone-implementation.patch …Eigencraft-redstone-implementation.patchpaper-server/patches/features/0032-fixup-Eigencraft-redstone-implementation.patch renamed to paper-server/patches/features/0033-fixup-Eigencraft-redstone-implementation.patch paper-server/patches/features/0032-fixup-Eigencraft-redstone-implementation.patch renamed to paper-server/patches/features/0033-fixup-Eigencraft-redstone-implementation.patch

@@ -468,7 +468,7 @@ index a3645322be006d5501fa7fb8944509a9c6b58e32..deddf9503affc1720b1e4877e4a28e07
              // Paper end
          }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da859a1b3b7d 100644
+index e158d614abed8d16e80192c0c9abd8537c92b9dc..053c59f5eeb8061dc0d4ba2182ea2c1a797a5fa5 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -330,7 +330,7 @@ public class ServerGamePacketListenerImpl
@@ -480,7 +480,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          this.playerGameConnection =  new io.papermc.paper.connection.PaperPlayerGameConnection(this); // Paper
      }
 
-@@ -485,7 +485,7 @@ public class ServerGamePacketListenerImpl
+@@ -486,7 +486,7 @@ public class ServerGamePacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
          // CraftBukkit start
          if (!packet.input().equals(this.player.getLastClientInput())) {
@@ -489,7 +489,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              this.cserver.getPluginManager().callEvent(event);
          }
          // CraftBukkit end
-@@ -493,7 +493,7 @@ public class ServerGamePacketListenerImpl
+@@ -494,7 +494,7 @@ public class ServerGamePacketListenerImpl
          net.minecraft.world.entity.player.Input lastInput = this.player.getLastClientInput();
          if (lastInput.shift() != packet.input().shift()) {
              // Has sneak changed
@@ -498,7 +498,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              this.cserver.getPluginManager().callEvent(event);
 
              // Technically the player input and the flag is desynced, but this is previous behavior.. so should be fine?
-@@ -683,7 +683,7 @@ public class ServerGamePacketListenerImpl
+@@ -684,7 +684,7 @@ public class ServerGamePacketListenerImpl
                      this.lastPitch = to.getPitch();
 
                      Location oldTo = to.clone();
@@ -507,7 +507,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                      this.cserver.getPluginManager().callEvent(event);
 
                      // If the event is cancelled we move the player back to their old location.
-@@ -884,7 +884,7 @@ public class ServerGamePacketListenerImpl
+@@ -885,7 +885,7 @@ public class ServerGamePacketListenerImpl
              }
              // Paper start - Brigadier API
              com.mojang.brigadier.suggestion.Suggestions suggestions = builder.buildFuture().join();
@@ -516,7 +516,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              suggestEvent.setCancelled(suggestions.isEmpty());
              if (suggestEvent.callEvent()) {
                  this.connection.send(new ClientboundCommandSuggestionsPacket(packet.getId(), limitTo(suggestEvent.getSuggestions(), ServerGamePacketListenerImpl.MAX_COMMAND_SUGGESTIONS)));
-@@ -920,7 +920,7 @@ public class ServerGamePacketListenerImpl
+@@ -921,7 +921,7 @@ public class ServerGamePacketListenerImpl
                      }
                      // Paper end - Don't tab-complete namespaced commands if send-namespaced is false
                      // Paper start - Brigadier API
@@ -525,7 +525,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                      suggestEvent.setCancelled(suggestions.isEmpty());
                      if (suggestEvent.callEvent()) {
                          this.send(new ClientboundCommandSuggestionsPacket(packet.getId(), limitTo(suggestEvent.getSuggestions(), ServerGamePacketListenerImpl.MAX_COMMAND_SUGGESTIONS)));
-@@ -1077,8 +1077,8 @@ public class ServerGamePacketListenerImpl
+@@ -1078,8 +1078,8 @@ public class ServerGamePacketListenerImpl
              final int targetSlot = Inventory.isHotbarSlot(sourceSlot) ? sourceSlot : inventory.getSuitableHotbarSlot();
              final org.bukkit.entity.Player bukkitPlayer = this.player.getBukkitEntity();
              final io.papermc.paper.event.player.PlayerPickItemEvent event = entity != null
@@ -536,7 +536,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              if (!event.callEvent()) {
                  return;
              }
-@@ -1559,7 +1559,7 @@ public class ServerGamePacketListenerImpl
+@@ -1560,7 +1560,7 @@ public class ServerGamePacketListenerImpl
                                          to.setPitch(packet.xRot);
                                      }
 
@@ -545,7 +545,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
 
                                      if (event.callEvent()) {
                                          this.player.jumpFromGround();
-@@ -1669,7 +1669,7 @@ public class ServerGamePacketListenerImpl
+@@ -1670,7 +1670,7 @@ public class ServerGamePacketListenerImpl
                                          this.lastPitch = to.getPitch();
 
                                          Location oldTo = to.clone();
@@ -554,7 +554,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                                          this.cserver.getPluginManager().callEvent(event);
 
                                          // If the event is cancelled we move the player back to their old location.
-@@ -1846,7 +1846,7 @@ public class ServerGamePacketListenerImpl
+@@ -1847,7 +1847,7 @@ public class ServerGamePacketListenerImpl
              final io.papermc.paper.entity.TeleportFlag.Relative flag = org.bukkit.craftbukkit.entity.CraftEntity.deltaRelativeToAPI(relativeArgument);
              if (flag != null) relativeFlags.add(flag);
          }
@@ -563,7 +563,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          // Paper end - Teleport API
          this.cserver.getPluginManager().callEvent(event);
 
-@@ -1934,7 +1934,7 @@ public class ServerGamePacketListenerImpl
+@@ -1935,7 +1935,7 @@ public class ServerGamePacketListenerImpl
                          // CraftBukkit start - inspiration taken from DispenserRegistry (See SpigotCraft#394)
                          CraftItemStack mainHand = CraftItemStack.asCraftMirror(itemInHand1);
                          CraftItemStack offHand = CraftItemStack.asCraftMirror(this.player.getItemInHand(InteractionHand.MAIN_HAND));
@@ -572,7 +572,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                          this.cserver.getPluginManager().callEvent(swapItemsEvent);
                          if (swapItemsEvent.isCancelled()) {
                              return;
-@@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl
+@@ -2286,7 +2286,7 @@ public class ServerGamePacketListenerImpl
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
              if (packet.getSlot() == this.player.getInventory().getSelectedSlot()) { return; } // Paper - don't fire itemheldevent when there wasn't a slot change
@@ -581,7 +581,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              this.cserver.getPluginManager().callEvent(event);
              if (event.isCancelled()) {
                  this.send(new ClientboundSetHeldSlotPacket(this.player.getInventory().getSelectedSlot()));
-@@ -2356,7 +2356,7 @@ public class ServerGamePacketListenerImpl
+@@ -2357,7 +2357,7 @@ public class ServerGamePacketListenerImpl
              LOGGER.info("{} issued server command: {}", this.player.getScoreboardName(), prefixedCommand);
          }
 
@@ -590,7 +590,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          this.cserver.getPluginManager().callEvent(event);
 
          if (event.isCancelled()) {
-@@ -2398,7 +2398,7 @@ public class ServerGamePacketListenerImpl
+@@ -2399,7 +2399,7 @@ public class ServerGamePacketListenerImpl
              LOGGER.info("{} issued server command: {}", this.player.getScoreboardName(), command);
          } // Paper - Add missing SpigotConfig logCommands check
 
@@ -599,7 +599,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          this.cserver.getPluginManager().callEvent(event);
          command = event.getMessage().substring(1);
 
-@@ -2659,7 +2659,7 @@ public class ServerGamePacketListenerImpl
+@@ -2660,7 +2660,7 @@ public class ServerGamePacketListenerImpl
          } // Paper end - Call interact event
 
          // Arm swing animation
@@ -608,7 +608,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          this.cserver.getPluginManager().callEvent(event);
 
          if (event.isCancelled()) return;
-@@ -2676,7 +2676,7 @@ public class ServerGamePacketListenerImpl
+@@ -2677,7 +2677,7 @@ public class ServerGamePacketListenerImpl
              switch (packet.getAction()) {
                  case START_SPRINTING:
                  case STOP_SPRINTING: {
@@ -617,7 +617,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                      this.cserver.getPluginManager().callEvent(event);
 
                      if (event.isCancelled()) {
-@@ -2887,13 +2887,13 @@ public class ServerGamePacketListenerImpl
+@@ -2888,13 +2888,13 @@ public class ServerGamePacketListenerImpl
 
                              @Override
                              public void onInteraction(InteractionHand hand) {
@@ -633,7 +633,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                                  );
                              }
 
-@@ -3359,7 +3359,7 @@ public class ServerGamePacketListenerImpl
+@@ -3360,7 +3360,7 @@ public class ServerGamePacketListenerImpl
                              // Paper start - Add PlayerRecipeBookClickEvent
                              NamespacedKey recipeName = org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(recipeHolder.id().identifier());
                              boolean makeAll = packet.useMaxItems();
@@ -642,7 +642,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                                  this.player.getBukkitEntity(), recipeName, makeAll
                              );
                              if (!paperEvent.callEvent()) {
-@@ -3512,7 +3512,7 @@ public class ServerGamePacketListenerImpl
+@@ -3513,7 +3513,7 @@ public class ServerGamePacketListenerImpl
          BlockPos pos = packet.getPos();
          if (serverLevel.hasChunkAt(pos)) {
              // Paper start - Add API for client-side signs
@@ -651,7 +651,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
                  this.player.getBukkitEntity(),
                  io.papermc.paper.util.MCUtil.toPosition(pos),
                  packet.isFrontText() ? org.bukkit.block.sign.Side.FRONT : org.bukkit.block.sign.Side.BACK,
-@@ -3534,7 +3534,7 @@ public class ServerGamePacketListenerImpl
+@@ -3535,7 +3535,7 @@ public class ServerGamePacketListenerImpl
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
          // CraftBukkit start
          if (this.player.getAbilities().mayfly && this.player.getAbilities().flying != packet.isFlying()) {
@@ -660,17 +660,17 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
              this.cserver.getPluginManager().callEvent(event);
              if (!event.isCancelled()) {
                  this.player.getAbilities().flying = packet.isFlying(); // Actually set the player's flying status
-@@ -3719,8 +3719,7 @@ public class ServerGamePacketListenerImpl
-     private void markClientLoaded() {
-         // Paper start - Add PlayerLoadedWorldEvent
+@@ -3725,8 +3725,7 @@ public class ServerGamePacketListenerImpl
+ 
+     private void markClientLoaded(boolean timeout) {
          if (!hasClientLoaded()) {
--            final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), true);
+-            final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), timeout);
 -            event.callEvent();
-+            new io.papermc.paper.event.player.PaperPlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), true).callEvent();
++            new io.papermc.paper.event.player.PaperPlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), timeout).callEvent();
          }
          // Paper end - Add PlayerLoadedWorldEvent
          this.clientLoadedTimeoutTimer = 0;
-@@ -3746,8 +3745,9 @@ public class ServerGamePacketListenerImpl
+@@ -3752,8 +3751,9 @@ public class ServerGamePacketListenerImpl
          org.bukkit.entity.Player player = this.getCraftPlayer();
          Location from = new Location(player.getWorld(), this.lastPosX, this.lastPosY, this.lastPosZ, this.lastYaw, this.lastPitch);
          Location to = new Location(player.getWorld(), toX, toY, toZ, toYaw, toPitch);
@@ -682,7 +682,7 @@ index bcd1a5dcbb43c604430001e27e8d711b41c8bab0..03b7379404212e7bdc9272114b12da85
          event.callEvent();
          return event;
      }
-@@ -3785,7 +3785,7 @@ public class ServerGamePacketListenerImpl
+@@ -3791,7 +3791,7 @@ public class ServerGamePacketListenerImpl
          // Paper start - store last pack status
          org.bukkit.event.player.PlayerResourcePackStatusEvent.Status packStatus = org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()];
          this.connection.resourcePackStatus = packStatus;
@@ -834,7 +834,7 @@ index 0685501ce48bbfcc8d782e9033c35ba82ef6c2e8..83c5c490a561e55a982d279dfc7b24e7
      }
 
 diff --git a/net/minecraft/world/effect/MobEffectInstance.java b/net/minecraft/world/effect/MobEffectInstance.java
-index 5888dcb3ce9b988a6ba1ff4f810f41522bc25161..f078809a5d4252ef83d5cdb9f778ef429c328d1d 100644
+index 3bcfe2faca53e85a20bdbf847b25aef9c61e24f6..14d149758744404abfc9ebd2b3754adb2f0757ca 100644
 --- a/net/minecraft/world/effect/MobEffectInstance.java
 +++ b/net/minecraft/world/effect/MobEffectInstance.java
 @@ -218,7 +218,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
@@ -1241,7 +1241,7 @@ index 3b931c6105ea14add0d2a60dc19cc3601a092a3b..f64301631e192c796367ff3fabb52527
              if (event.isCancelled()) {
                  return;
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 7bf160cef8bd772d27d4a71f04d5d9861ef67984..a0eeff099709fbf85beb2261f10dabb07db25d00 100644
+index e4240fa38fb8513c7e320a4b30e6dcbb7e015310..1dbd6586d35be9b13c81609b8002974e48ab74d6 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -258,7 +258,7 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -1280,7 +1280,7 @@ index 7bf160cef8bd772d27d4a71f04d5d9861ef67984..a0eeff099709fbf85beb2261f10dabb0
              (org.bukkit.entity.Player) this.getBukkitEntity(),
              target.getBukkitEntity(),
              !cannotAttack
-@@ -2014,7 +2014,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+@@ -2035,7 +2035,7 @@ public abstract class Player extends Avatar implements ContainerUser {
      // We pass a result mutable boolean in to allow the caller of this method to know if the event was cancelled.
      protected boolean tryReadyArrow(ItemStack bow, ItemStack itemstack, final org.apache.commons.lang3.mutable.MutableBoolean cancelled) {
          if (!(this instanceof final ServerPlayer serverPlayer)) return true;
@@ -2559,7 +2559,7 @@ index e357e98b6e362800c07dec7faf94bcedc578f4cb..5b9f136018adaaf8f387c7bb63036b9a
              && level.getDifficulty() != Difficulty.PEACEFUL
              && entity instanceof LivingEntity livingEntity
 diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index c8bfa1eeb847d6d9972d2f6625cc1f60063713d4..3eae953cfe9379cc706344b5c00765668a214b4a 100644
+index 1215ac44fd30dc872f9d319be34e5e08ba880ea2..732b65bf72fdd8666a2107accd17d223ac51829c 100644
 --- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -204,7 +204,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -2597,7 +2597,7 @@ index c8bfa1eeb847d6d9972d2f6625cc1f60063713d4..3eae953cfe9379cc706344b5c0076566
 +            event = new org.bukkit.craftbukkit.event.block.CraftFurnaceExtractEvent(
                  serverPlayer.getBukkitEntity(),
                  org.bukkit.craftbukkit.block.CraftBlock.at(level, blockPos),
-                 org.bukkit.craftbukkit.inventory.CraftItemType.minecraftToBukkit(itemStack.getItem()),
+                 itemStack.asBukkitCopy(),
 @@ -495,7 +495,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
                  floor
              );