diff --git a/paper-server/patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch b/paper-server/patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch index 44ed121c0f..00eaac6211 100644 --- a/paper-server/patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/damagesource/DamageSource.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/damagesource/DamageSource.java +++ b/net/minecraft/world/damagesource/DamageSource.java -@@ -20,6 +_,105 @@ +@@ -20,6 +_,107 @@ private final Entity directEntity; @Nullable private final Vec3 damageSourcePosition; @@ -58,18 +58,19 @@ + return damageSource; + } + ++ @Nullable + public org.bukkit.block.Block getDirectBlock() { + return this.directBlock; + } + -+ public DamageSource directBlock(net.minecraft.world.level.Level world, net.minecraft.core.BlockPos blockPosition) { ++ public DamageSource directBlock(@Nullable net.minecraft.world.level.Level world, @Nullable net.minecraft.core.BlockPos blockPosition) { + if (blockPosition == null || world == null) { + return this; + } + return this.directBlock(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockPosition)); + } + -+ public DamageSource directBlock(org.bukkit.block.Block block) { ++ public DamageSource directBlock(@Nullable org.bukkit.block.Block block) { + if (block == null) { + return this; + } @@ -79,11 +80,12 @@ + return damageSource; + } + ++ @Nullable + public org.bukkit.block.BlockState getDirectBlockState() { + return this.directBlockState; + } + -+ public DamageSource directBlockState(org.bukkit.block.BlockState blockState) { ++ public DamageSource directBlockState(@Nullable org.bukkit.block.BlockState blockState) { + if (blockState == null) { + return this; + }