956

patches/server/Add-drops-to-shear-events.patch

@@ -243,20 +243,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start - shear drops API
 +        this.generateShearedMushrooms(stack -> {
 +            this.forceDrops = true;
-+            this.spawnAtLocation(stack);
++            this.spawnAtLocation(stack, this.getBbHeight());
 +            this.forceDrops = false;
 +        });
 +    }
 +    private void generateShearedMushrooms(java.util.function.Consumer<ItemStack> stackConsumer) {
 +        // Paper end - shear drops API
-         if (this.level() instanceof ServerLevel serverLevel && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
+         if (this.level() instanceof ServerLevel serverLevel) {
              LootTable lootTable = serverLevel.getServer().reloadableRegistries().getLootTable(BuiltInLootTables.BOGGED_SHEAR);
              LootParams lootParams = new LootParams.Builder(serverLevel)
 @@ -0,0 +0,0 @@ public class Bogged extends AbstractSkeleton implements Shearable {
                  .create(LootContextParamSets.SHEARING);
  
              for (ItemStack itemStack : lootTable.getRandomItems(lootParams)) {
--                this.spawnAtLocation(itemStack);
+-                this.spawnAtLocation(itemStack, this.getBbHeight());
 +                stackConsumer.accept(itemStack); // Paper
              }
          }

patches/server/Disable-memory-reserve-allocating.patch

@@ -14,6 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static void preload() {
 -        MemoryReserve.allocate();
 +        // MemoryReserve.allocate(); // Paper - Disable memory reserve allocating
-         (new CrashReport("Don't panic!", new Throwable())).getFriendlyReport();
+         (new CrashReport("Don't panic!", new Throwable())).getFriendlyReport(ReportType.CRASH);
      }
  }

patches/server/Dont-resend-blocks-on-interactions.patch

@@ -54,8 +54,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    //}
 +                    // Paper end - Don't resync blocks
                  } else if (!iblockdata.isAir()) {
-                     iblockdata.attack(this.level, pos, this.player);
-                     f = iblockdata.getDestroyProgress(this.player, this.player.level(), pos);
+                     EnchantmentHelper.onHitBlock(this.level, this.player.getMainHandItem(), this.player, this.player, EquipmentSlot.MAINHAND, Vec3.atCenterOf(pos), iblockdata, (item) -> {
+                         this.player.onEquippedItemBroken(item, EquipmentSlot.MAINHAND);
 @@ -0,0 +0,0 @@ public class ServerPlayerGameMode {
                  if (event.useItemInHand() == Event.Result.DENY) {
                      // If we 'insta destroyed' then the client needs to be informed.

patches/server/Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch

@@ -16,4 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                flag = entity.hurt(this.damageSources().magic().customCausingEntity(this), 5.0F); // Paper - Fire EntityDamageByEntityEvent for unowned wither skulls
              }
  
-             if (flag && entity instanceof LivingEntity) {
+             if (flag && entity instanceof LivingEntity entityliving) {

patches/server/Fix-DamageSource-API.patch

@@ -93,16 +93,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/BlockAttachedEntity.java b/src/main/java/net/minecraft/world/entity/decoration/BlockAttachedEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-@@ -0,0 +0,0 @@ public abstract class HangingEntity extends Entity {
+--- a/src/main/java/net/minecraft/world/entity/decoration/BlockAttachedEntity.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/BlockAttachedEntity.java
+@@ -0,0 +0,0 @@ public abstract class BlockAttachedEntity extends Entity {
          } else {
              if (!this.isRemoved() && !this.level().isClientSide) {
                  // CraftBukkit start - fire break events
--                Entity damager = (source.isIndirect()) ? source.getEntity() : source.getDirectEntity();
-+                Entity damager = (source.isIndirect() && source.getEntity() != null) ? source.getEntity() : source.getDirectEntity(); // Paper - fix DamageSource API
+-                Entity damager = (source.isDirect()) ? source.getDirectEntity() : source.getEntity();
++                Entity damager = (!source.isDirect() && source.getEntity() != null) ? source.getEntity() : source.getDirectEntity(); // Paper - fix DamageSource API
                  HangingBreakEvent event;
                  if (damager != null) {
                      event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damager.getBukkitEntity(), source.is(DamageTypeTags.IS_EXPLOSION) ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY);
@@ -116,9 +116,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.dead = true;
 -            this.level().explode(this, this.level().damageSources().explosion(this, this.entityIgniter, net.minecraft.world.damagesource.DamageTypes.EXPLOSION), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit
 +            this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this)
-             this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
              this.spawnLingeringCloud();
-             // CraftBukkit start
+             this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED);
+             this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java b/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java
@@ -137,14 +137,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 @@ -0,0 +0,0 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
- 
-                         entityplayer.connection.teleport(teleEvent.getTo());
-                         entity.resetFallDistance();
--                        entity.hurt(this.damageSources().fall().customEntityDamager(this), 5.0F); // CraftBukkit
-+                        entity.hurt(this.damageSources().fall().customEventDamager(this), 5.0F); // CraftBukkit // Paper - fix DamageSource API
-                     }
-                     // CraftBukkit end
-                     this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_TELEPORT, SoundSource.PLAYERS);
+                             // entity.changeDimension(new DimensionTransition(worldserver, this.position(), entity.getDeltaMovement(), entity.getYRot(), entity.getXRot(), DimensionTransition.DO_NOTHING)); // CraftBukkit - moved up
+                             entity.resetFallDistance();
+                             entityplayer.resetCurrentImpulseContext();
+-                            entity.hurt(this.damageSources().fall().customEntityDamager(this), 5.0F); // CraftBukkit
++                            entity.hurt(this.damageSources().fall().customEventDamager(this), 5.0F); // CraftBukkit // Paper - fix DamageSource API
+                             this.playSound(worldserver, this.position());
+                         }
+                     } else {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
@@ -157,7 +157,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                flag = entity.hurt(this.damageSources().magic().customEventDamager(this), 5.0F); // Paper - Fire EntityDamageByEntityEvent for unowned wither skulls // Paper - fix DamageSource API
              }
  
-             if (flag && entity instanceof LivingEntity) {
+             if (flag && entity instanceof LivingEntity entityliving) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java
@@ -176,7 +176,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public boolean isIndirect() {
 -        return this.getHandle().getEntity() != this.getHandle().getDamager();
-+        return this.getHandle().isIndirect(); // Paper - fix DamageSource API
++        return !this.getHandle().isDirect(); // Paper - fix DamageSource API
      }
  
      @Override

patches/server/Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch

@@ -38,16 +38,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              Location to = teleport.getTo();
                              this.teleportTo(to.getX(), to.getY(), to.getZ());
                          } else {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
+diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java
-@@ -0,0 +0,0 @@ public class FollowOwnerGoal extends Goal {
+--- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
++++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
+@@ -0,0 +0,0 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
          } else {
              // CraftBukkit start
-             EntityTeleportEvent event = CraftEventFactory.callEntityTeleportEvent(this.tamable, (double) x + 0.5D, (double) y, (double) z + 0.5D);
+             EntityTeleportEvent event = CraftEventFactory.callEntityTeleportEvent(this, (double) x + 0.5D, (double) y, (double) z + 0.5D);
 -            if (event.isCancelled()) {
-+            if (event.isCancelled() || event.getTo() == null) { // Paper
++            if (event.isCancelled() || event.getTo() == null) { // Paper - prevent NP on null event to location
                  return false;
              }
              Location to = event.getTo();

patches/server/Item-Mutation-Fixes.patch

@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.access.execute((world, blockposition) -> {
 -                    ItemStack itemstack2 = itemstack;
 +                    ItemStack itemstack2 = itemstack; // Paper - diff on change
-                     List<EnchantmentInstance> list = this.getEnchantmentList(world.enabledFeatures(), itemstack, id, this.costs[id]);
+                     List<EnchantmentInstance> list = this.getEnchantmentList(world.registryAccess(), itemstack, id, this.costs[id]);
  
                      // CraftBukkit start
 @@ -0,0 +0,0 @@ public class EnchantmentMenu extends AbstractContainerMenu {
@@ -22,14 +22,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          }
                          // CraftBukkit end
 -                        if (itemstack.is(Items.BOOK)) {
--                            itemstack2 = itemstack.transmuteCopy(Items.ENCHANTED_BOOK, 1);
+-                            itemstack2 = itemstack.transmuteCopy(Items.ENCHANTED_BOOK);
 +                        // Paper start
 +                        itemstack2 = org.bukkit.craftbukkit.inventory.CraftItemStack.getOrCloneOnMutation(item, event.getItem());
 +                        if (itemstack2 != itemstack) {
                              this.enchantSlots.setItem(0, itemstack2);
                          }
 +                        if (itemstack2.is(Items.BOOK)) {
-+                            itemstack2 = itemstack2.transmuteCopy(Items.ENCHANTED_BOOK, 1);
++                            itemstack2 = itemstack2.transmuteCopy(Items.ENCHANTED_BOOK);
 +                            this.enchantSlots.setItem(0, itemstack2);
 +                        }
 +                        // Paper end

patches/server/Reduce-allocation-of-Vec3D-by-entity-tracker.patch

@@ -56,4 +56,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // Paper end - reduce allocation of Vec3D here
                  Packet<?> packet1 = null;
                  boolean flag2 = flag1 || this.tickCount % 60 == 0;
-                 boolean flag3 = Math.abs(i - this.yRotp) >= 1 || Math.abs(j - this.xRotp) >= 1;
+                 boolean flag3 = Math.abs(i - this.lastSentYRot) >= 1 || Math.abs(j - this.lastSentXRot) >= 1;

patches/server/Validate-ResourceLocation-in-NBT-reading.patch

@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!nbt.contains("Name", 8)) {
              return Blocks.AIR.defaultBlockState();
          } else {
--            ResourceLocation resourceLocation = new ResourceLocation(nbt.getString("Name"));
+-            ResourceLocation resourceLocation = ResourceLocation.parse(nbt.getString("Name"));
 -            Optional<? extends Holder<Block>> optional = blockLookup.get(ResourceKey.create(Registries.BLOCK, resourceLocation));
 +            // Paper start - Validate resource location
 +            ResourceLocation resourceLocation = ResourceLocation.tryParse(nbt.getString("Name"));
@@ -25,10 +25,10 @@ diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/m
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java
 +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -0,0 +0,0 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
-     private final String path;
+@@ -0,0 +0,0 @@ public final class ResourceLocation implements Comparable<ResourceLocation> {
+ 
+         assert isValidPath(path);
  
-     protected ResourceLocation(String namespace, String path, @Nullable ResourceLocation.Dummy extraData) {
 +        // Paper start - Validate ResourceLocation
 +        // Check for the max network string length (capped at Short.MAX_VALUE) as well as the max bytes of a StringTag (length written as an unsigned short)
 +        final String resourceLocation = namespace + ":" + path;
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      default boolean tryLoadLootTable(CompoundTag nbt) {
          if (nbt.contains("LootTable", 8)) {
--            this.setLootTable(ResourceKey.create(Registries.LOOT_TABLE, new ResourceLocation(nbt.getString("LootTable"))));
+-            this.setLootTable(ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(nbt.getString("LootTable"))));
 +            this.setLootTable(net.minecraft.Optionull.map(ResourceLocation.tryParse(nbt.getString("LootTable")), rl -> ResourceKey.create(Registries.LOOT_TABLE, rl))); // Paper - Validate ResourceLocation
              if (this.lootableData() != null && this.getLootTable() != null) this.lootableData().loadNbt(nbt); // Paper - LootTable API
              if (nbt.contains("LootTableSeed", 4)) {
@@ -60,7 +60,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public static Optional<EntityType<?>> by(CompoundTag nbt) {
--        return BuiltInRegistries.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id")));
+-        return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.parse(nbt.getString("id")));
 +        return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); // Paper - Validate ResourceLocation
      }
  
@@ -70,10 +70,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
          if (nbt.contains("SleepingX", 99) && nbt.contains("SleepingY", 99) && nbt.contains("SleepingZ", 99)) {
              BlockPos blockposition = new BlockPos(nbt.getInt("SleepingX"), nbt.getInt("SleepingY"), nbt.getInt("SleepingZ"));
--
+ 
 +            if (this.position().distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 16 * 16) { // Paper - The sleeping pos will always also set the actual pos, so a desync suggests something is wrong
              this.setSleepingPos(blockposition);
              this.entityData.set(LivingEntity.DATA_POSE, Pose.SLEEPING);
@@ -88,11 +87,11 @@ diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/n
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
- 
+@@ -0,0 +0,0 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+         this.leashData = this.readLeashData(nbt);
          this.setLeftHanded(nbt.getBoolean("LeftHanded"));
          if (nbt.contains("DeathLootTable", 8)) {
--            this.lootTable = ResourceKey.create(Registries.LOOT_TABLE, new ResourceLocation(nbt.getString("DeathLootTable")));
+-            this.lootTable = ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(nbt.getString("DeathLootTable")));
 +            this.lootTable = net.minecraft.Optionull.map(ResourceLocation.tryParse(nbt.getString("DeathLootTable")), rl -> ResourceKey.create(Registries.LOOT_TABLE, rl)); // Paper - Validate ResourceLocation
              this.lootTableSeed = nbt.getLong("DeathLootTableSeed");
          }
@@ -105,11 +104,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.setCritArrow(nbt.getBoolean("crit"));
          this.setPierceLevel(nbt.getByte("PierceLevel"));
          if (nbt.contains("SoundEvent", 8)) {
--            this.soundEvent = (SoundEvent) BuiltInRegistries.SOUND_EVENT.getOptional(new ResourceLocation(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
+-            this.soundEvent = (SoundEvent) BuiltInRegistries.SOUND_EVENT.getOptional(ResourceLocation.parse(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
 +            this.soundEvent = (SoundEvent) BuiltInRegistries.SOUND_EVENT.getOptional(ResourceLocation.tryParse(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent()); // Paper - Validate resource location
          }
  
-         this.setShotFromCrossbow(nbt.getBoolean("ShotFromCrossbow"));
+         if (nbt.contains("item", 10)) {
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java
@@ -118,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      default void readChestVehicleSaveData(CompoundTag nbt, HolderLookup.Provider registriesLookup) {
          this.clearItemStacks();
          if (nbt.contains("LootTable", 8)) {
--            this.setLootTable(ResourceKey.create(Registries.LOOT_TABLE, new ResourceLocation(nbt.getString("LootTable"))));
+-            this.setLootTable(ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(nbt.getString("LootTable"))));
 +            this.setLootTable(net.minecraft.Optionull.map(ResourceLocation.tryParse(nbt.getString("LootTable")), rl -> ResourceKey.create(Registries.LOOT_TABLE, rl))); // Paper - Validate ResourceLocation
              // Paper start - LootTable API
              if (this.getLootTable() != null) {
@@ -131,7 +130,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          while (iterator.hasNext()) {
              String s = (String) iterator.next();
  
--            this.recipesUsed.put(new ResourceLocation(s), nbttagcompound1.getInt(s));
+-            this.recipesUsed.put(ResourceLocation.parse(s), nbttagcompound1.getInt(s));
 +            // Paper start - Validate ResourceLocation
 +            final ResourceLocation resourceLocation = ResourceLocation.tryParse(s);
 +            if (resourceLocation != null) {
@@ -149,7 +148,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      private boolean tryLoadLootTable(CompoundTag nbt) {
          if (nbt.contains("LootTable", 8)) {
--            this.lootTable = ResourceKey.create(Registries.LOOT_TABLE, new ResourceLocation(nbt.getString("LootTable")));
+-            this.lootTable = ResourceKey.create(Registries.LOOT_TABLE, ResourceLocation.parse(nbt.getString("LootTable")));
 +            this.lootTable = net.minecraft.Optionull.map(ResourceLocation.tryParse(nbt.getString("LootTable")), rl -> ResourceKey.create(Registries.LOOT_TABLE, rl)); // Paper - Validate ResourceLocation
              this.lootTableSeed = nbt.getLong("LootTableSeed");
              return true;