readd wrongly dropped diff

Author: Lulu13022002

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch

@@ -48,7 +48,7 @@
                  blockSource.level().gameEvent(null, GameEvent.ENTITY_PLACE, blockSource.pos());
                  return item;
              }
-@@ -110,8 +_,20 @@
+@@ -110,12 +_,38 @@
                      Direction direction = blockSource.state().getValue(DispenserBlock.FACING);
                      BlockPos blockPos = blockSource.pos().relative(direction);
                      ServerLevel serverLevel = blockSource.level();
@@ -63,13 +63,32 @@
 +                    if (event.isCancelled()) {
 +                        return item;
 +                    }
++
++                    boolean shrink = true;
++                    if (!event.getItem().equals(craftItem)) {
++                        shrink = false;
++                        // Chain to handler for new item
++                        ItemStack eventStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getItem());
++                        DispenseItemBehavior dispenseBehavior = DispenserBlock.getDispenseBehavior(blockSource, eventStack);
++                        if (dispenseBehavior != DispenseItemBehavior.NOOP && dispenseBehavior != this) {
++                            dispenseBehavior.dispense(blockSource, eventStack);
++                            return item;
++                        }
++                    }
++                    // CraftBukkit end
++
 +                    final ItemStack newStack = org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getItem()); // Paper - use event itemstack (unwrap is fine here because the stack won't be modified)
                      Consumer<ArmorStand> consumer = EntityType.appendDefaultStackConfig(
 -                        armorStand1 -> armorStand1.setYRot(direction.toYRot()), serverLevel, item, null
 +                        armorStand1 -> armorStand1.setYRot(direction.toYRot()), serverLevel, newStack, null // Paper - track changed items in the dispense event
                      );
                      ArmorStand armorStand = EntityType.ARMOR_STAND.spawn(serverLevel, consumer, blockPos, EntitySpawnReason.DISPENSER, false, false);
                      if (armorStand != null) {
+-                        item.shrink(1);
++                        if (shrink) item.shrink(1); // Paper
+                     }
+ 
+                     return item;
 @@ -135,8 +_,35 @@
                              new AABB(blockPos),
                              abstractChestedHorse1 -> abstractChestedHorse1.isAlive() && !abstractChestedHorse1.hasChest()
@@ -289,7 +308,7 @@
 -                    serverLevel.gameEvent(null, GameEvent.ENTITY_PLACE, blockPos);
 -                    item.shrink(1);
 +                    serverLevel.gameEvent(null, GameEvent.ENTITY_PLACE, org.bukkit.craftbukkit.util.CraftVector.toBlockPos(event.getVelocity())); // Paper - update game event position
-+                    if (shrink) item.shrink(1);
++                    if (shrink) item.shrink(1); // Paper
                      this.setSuccess(true);
                      return item;
                  }

paper-server/patches/sources/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java.patch

@@ -40,8 +40,8 @@
 +
 +        // SPIGOT-7923: Avoid create projectiles with empty item
 +        if (!singleItemStack.isEmpty()) {
-+            Projectile iprojectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(serverLevel, dispensePosition, org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getItem()), direction), serverLevel, singleItemStack, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // Paper - track changed items in the dispense event; unwrap is safe here because all uses of the stack make their own copies
-+            iprojectile.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(blockSource.blockEntity());
++            Projectile projectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(serverLevel, dispensePosition, org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getItem()), direction), serverLevel, singleItemStack, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // Paper - track changed items in the dispense event; unwrap is safe here because all uses of the stack make their own copies
++            projectile.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(blockSource.blockEntity());
 +        }
 +        if (shrink) item.shrink(1);
 +        // CraftBukkit end

paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -33,7 +33,7 @@
          this.serverTextFilter = ServerTextFilter.createFromConfig(settings.getProperties());
          this.serverLinks = createServerLinks(settings);
      }
-@@ -102,26 +_,53 @@
+@@ -102,6 +_,10 @@
          Thread thread = new Thread("Server console handler") {
              @Override
              public void run() {
@@ -42,16 +42,13 @@
 +                new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
 +                /*
                  BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
--
+ 
                  String string1;
-                 try {
-                     while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning() && (string1 = bufferedReader.readLine()) != null) {
-                         DedicatedServer.this.handleConsoleInput(string1, DedicatedServer.this.createCommandSourceStack());
+@@ -111,17 +_,41 @@
                      }
                  } catch (IOException var4) {
--                    DedicatedServer.LOGGER.error("Exception handling console input", (Throwable)var4);
+                     DedicatedServer.LOGGER.error("Exception handling console input", (Throwable)var4);
 -                }
-+                    DedicatedServer.LOGGER.error("Exception handling console input", (Throwable) var4);
 +                }*/
 +                // Paper end - Use TerminalConsoleAppender
              }

paper-server/patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch

@@ -110,7 +110,7 @@
 +    private static void applyEffects(
 +        Level level, BlockPos pos, int beaconLevel, @Nullable Holder<MobEffect> primaryEffect, @Nullable Holder<MobEffect> secondaryEffect, @Nullable BeaconBlockEntity blockEntity
 +    ) {
-+        // Paper emd - pass beacon block entity
++        // Paper end - pass beacon block entity
          if (!level.isClientSide && primaryEffect != null) {
 -            double d = beaconLevel * 10 + 10;
 -            int i = 0;