some fixes and simplify overrides

Author: Lulu13022002

build-data/paper.at

@@ -233,6 +233,8 @@ public net.minecraft.world.entity.LivingEntity detectEquipmentUpdates()V
 public net.minecraft.world.entity.LivingEntity effectsDirty
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.LivingEntity getFallDamageSound(I)Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.LivingEntity getHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 public net.minecraft.world.entity.LivingEntity jumping
 public net.minecraft.world.entity.LivingEntity lastHurt
@@ -245,6 +247,7 @@ public net.minecraft.world.entity.LivingEntity playSecondaryHurtSound(Lnet/minec
 public net.minecraft.world.entity.LivingEntity setLivingEntityFlag(IZ)V
 public net.minecraft.world.entity.LivingEntity useItemRemaining
 public net.minecraft.world.entity.Mob armorDropChances
+public net.minecraft.world.entity.Mob getAmbientSound()Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.Mob getEquipmentDropChance(Lnet/minecraft/world/entity/EquipmentSlot;)F
 public net.minecraft.world.entity.Mob handDropChances
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
@@ -491,7 +494,6 @@ public net.minecraft.world.entity.raid.Raid ticksActive
 public net.minecraft.world.entity.raid.Raid totalHealth
 public net.minecraft.world.entity.raid.Raider$HoldGroundAttackGoal
 public net.minecraft.world.entity.raid.Raids raidMap
-public net.minecraft.world.entity.vehicle.AbstractBoat getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.entity.vehicle.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
 public net.minecraft.world.entity.vehicle.AbstractBoat status
 public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTable
@@ -502,6 +504,7 @@ public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionPowerBase
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionSpeedFactor
 public net.minecraft.world.entity.vehicle.MinecartTNT fuse
+public net.minecraft.world.entity.vehicle.VehicleEntity getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.flag.FeatureFlag mask
 public net.minecraft.world.flag.FeatureFlag universe
 public net.minecraft.world.flag.FeatureFlagRegistry names
@@ -560,6 +563,7 @@ public net.minecraft.world.level.BaseSpawner spawnCount
 public net.minecraft.world.level.BaseSpawner spawnDelay
 public net.minecraft.world.level.BaseSpawner spawnPotentials
 public net.minecraft.world.level.BaseSpawner spawnRange
+public net.minecraft.world.level.GameRules$Value deserialize(Ljava/lang/String;)V
 public net.minecraft.world.level.GameRules$Value onChanged(Lnet/minecraft/server/MinecraftServer;)V
 public net.minecraft.world.level.Level getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 public net.minecraft.world.level.Level levelData

paper-api/src/main/java/org/bukkit/block/Bell.java

@@ -26,7 +26,9 @@ public interface Bell extends TileState {
      * @param entity the entity ringing the bell
      * @return true if rung successfully, false if the event was cancelled
      */
-    public boolean ring(@Nullable Entity entity);
+    default boolean ring(@Nullable Entity entity) {
+        return this.ring(entity, null);
+    }
 
     /**
      * Ring this bell. This will call a {@link BellRingEvent}.
@@ -35,15 +37,19 @@ public interface Bell extends TileState {
      * ring in the direction that the bell is facing
      * @return true if rung successfully, false if the event was cancelled
      */
-    public boolean ring(@Nullable BlockFace direction);
+    default boolean ring(@Nullable BlockFace direction) {
+        return this.ring(null, direction);
+    }
 
     /**
      * Ring this bell in the direction that the bell is facing. This will call a
      * {@link BellRingEvent}.
      *
      * @return true if rung successfully, false if the event was cancelled
      */
-    public boolean ring();
+    default boolean ring() {
+        return this.ring(null, null);
+    }
 
     /**
      * Check whether or not this bell is shaking. A bell is considered to be

paper-api/src/main/java/org/bukkit/event/entity/EntityTargetEvent.java

@@ -162,11 +162,11 @@ public enum TargetReason {
         /**
          * When the target is in a different dimension
          */
-        TARGET_OTHER_LEVEL, // Paper
+        TARGET_OTHER_LEVEL,
         /**
          * When the target is in creative or spectator gamemode, or the difficulty is peaceful, or other reasons
          */
-        TARGET_INVALID, // Paper
+        TARGET_INVALID,
         /**
          * A currently unknown reason for the entity changing target.
          */

paper-server/patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

@@ -18,11 +18,10 @@
 
      public CommandSourceStack(
          CommandSource source,
-@@ -187,6 +_,30 @@
-                 this.chatMessageChainer
+@@ -188,6 +_,30 @@
              );
      }
-+    
+ 
 +    // Paper start - Expose 'with' functions from the CommandSourceStack
 +    @Override
 +    public CommandSourceStack withLocation(org.bukkit.Location location) {
@@ -46,9 +45,10 @@
 +        );
 +    }
 +    // Paper end - Expose 'with' functions from the CommandSourceStack
- 
++
      public CommandSourceStack withRotation(Vec2 rotation) {
          return this.rotation.equals(rotation)
+             ? this
 @@ -391,9 +_,44 @@
 
      @Override

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

@@ -309,25 +309,25 @@
                  }
 +                // CraftBukkit start
 +                level.captureTreeGeneration = false;
-+                if (level.capturedBlockStates.size() > 0) {
++                if (!level.capturedBlockStates.isEmpty()) {
 +                    org.bukkit.TreeType treeType = net.minecraft.world.level.block.SaplingBlock.treeType;
 +                    net.minecraft.world.level.block.SaplingBlock.treeType = null;
 +                    org.bukkit.Location location = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(blockPos, level.getWorld());
-+                    List<org.bukkit.block.BlockState> blocks = new java.util.ArrayList<>(level.capturedBlockStates.values());
++                    List<org.bukkit.block.BlockState> states = new java.util.ArrayList<>(level.capturedBlockStates.values());
 +                    level.capturedBlockStates.clear();
 +                    org.bukkit.event.world.StructureGrowEvent structureEvent = null;
 +                    if (treeType != null) {
-+                        structureEvent = new org.bukkit.event.world.StructureGrowEvent(location, treeType, false, null, blocks);
++                        structureEvent = new org.bukkit.event.world.StructureGrowEvent(location, treeType, false, null, states);
 +                        org.bukkit.Bukkit.getPluginManager().callEvent(structureEvent);
 +                    }
 +
-+                    org.bukkit.event.block.BlockFertilizeEvent fertilizeEvent = new org.bukkit.event.block.BlockFertilizeEvent(location.getBlock(), null, blocks);
++                    org.bukkit.event.block.BlockFertilizeEvent fertilizeEvent = new org.bukkit.event.block.BlockFertilizeEvent(location.getBlock(), null, states);
 +                    fertilizeEvent.setCancelled(structureEvent != null && structureEvent.isCancelled());
 +                    org.bukkit.Bukkit.getPluginManager().callEvent(fertilizeEvent);
 +
 +                    if (!fertilizeEvent.isCancelled()) {
-+                        for (org.bukkit.block.BlockState blockstate : blocks) {
-+                            org.bukkit.craftbukkit.block.CraftBlockState craftBlockState = (org.bukkit.craftbukkit.block.CraftBlockState) blocks;
++                        for (org.bukkit.block.BlockState state : states) {
++                            org.bukkit.craftbukkit.block.CraftBlockState craftBlockState = (org.bukkit.craftbukkit.block.CraftBlockState) state;
 +                            craftBlockState.place(craftBlockState.getFlags());
 +                            blockSource.level().checkCapturedTreeStateForObserverNotify(blockPos, craftBlockState); // Paper - notify observers even if grow failed
 +                        }

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

@@ -15,7 +15,7 @@
 +    }
 +
 +    private String getOverride(String name, String value) {
-+        if ((this.options != null) && (this.options.has(name))) {
++        if (this.options != null && this.options.has(name)) {
 +            return String.valueOf(this.options.valueOf(name));
 +        }
 +

paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -9,7 +9,7 @@
      private int lastSpawnChunkRadius;
      final EntityTickList entityTickList = new EntityTickList();
      public final PersistentEntitySectionManager<Entity> entityManager;
-@@ -205,11 +_,130 @@
+@@ -205,11 +_,131 @@
      private final boolean tickTime;
      private final RandomSequences randomSequences;
 
@@ -19,7 +19,8 @@
 +    public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
 +    public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
 +
-+    public LevelChunk getChunkIfLoaded(int x, int z) {
++    @Override
++    public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
 +        return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
 +    }
 +
@@ -362,13 +363,14 @@
                  }
              }
 
-@@ -577,6 +_,11 @@
+@@ -577,6 +_,12 @@
      }
 
      protected BlockPos findLightningTargetAround(BlockPos pos) {
 +        // Paper start - Add methods to find targets for lightning strikes
 +        return this.findLightningTargetAround(pos, false);
 +    }
++
 +    public BlockPos findLightningTargetAround(BlockPos pos, boolean returnNullWhenNoTarget) {
 +        // Paper end - Add methods to find targets for lightning strikes
          BlockPos heightmapPos = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
@@ -558,7 +560,7 @@
 +    }
 +
 +    @Override
-+    public boolean addFreshEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++    public boolean addFreshEntity(Entity entity, @Nullable org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +        return this.addEntity(entity, reason);
 +        // CraftBukkit end
      }
@@ -569,7 +571,7 @@
 +        return this.addWithUUID(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
 +    }
 +
-+    public boolean addWithUUID(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++    public boolean addWithUUID(Entity entity, @Nullable org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +        return this.addEntity(entity, reason);
 +        // CraftBukkit end
      }
@@ -582,7 +584,7 @@
 +        this.addDuringTeleport(entity, null);
 +    }
 +
-+    public void addDuringTeleport(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++    public void addDuringTeleport(Entity entity, @Nullable org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
 +        // CraftBukkit end
          if (entity instanceof ServerPlayer serverPlayer) {
              this.addPlayer(serverPlayer);
@@ -598,7 +600,7 @@
 
 -    private boolean addEntity(Entity entity) {
 +    // CraftBukkit start
-+    private boolean addEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
++    private boolean addEntity(Entity entity, @Nullable org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
 +        org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
 +        entity.generation = false; // Paper - Don't fire sync event during generation; Reset flag if it was added during a ServerLevel generation process
 +        // Paper start - extra debug info