chore(git): merge upstream changes

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>

Author: gabizou

src/main/java/org/spongepowered/common/event/SpongeCommonEventFactory.java

@@ -587,16 +587,13 @@ public static boolean handleCollideImpactEvent(final net.minecraft.world.entity.
             if (movingObjectType == HitResult.Type.BLOCK) {
                 final BlockHitResult blockMovingObjectPosition = (BlockHitResult) movingObjectPosition;
                 final BlockPos blockPos = blockMovingObjectPosition.getBlockPos();
-                if (blockPos.getY() < projectile.level().getMinY()) {
-                    return false;
-                }
-
                 final BlockSnapshot targetBlock = ((ServerWorld) projectile.level()).createSnapshot(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+                final ServerLocation targetLocation = ServerLocation.of((ServerWorld) projectile.level(), VecHelper.toVector3d(blockMovingObjectPosition.getBlockPos()));
                 final Direction side = DirectionFacingProvider.INSTANCE.getKey(blockMovingObjectPosition.getDirection()).get();
 
                 final CollideBlockEvent.Impact event = SpongeEventFactory.createCollideBlockEventImpact(frame.currentCause(),
                         impactPoint, targetBlock.state(),
-                        targetBlock.location().get(), side);
+                        targetLocation, side);
                 cancelled = SpongeCommon.post(event);
                 // Track impact block if event is not cancelled
                 if (!cancelled && creator.isPresent()) {

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java

@@ -331,7 +331,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel
     public BlockSnapshot bridge$createSnapshot(final int x, final int y, final int z) {
         final BlockPos pos = new BlockPos(x, y, z);
 
-        if (!((ServerLevel) (Object) this).isInWorldBounds(pos)) {
+        if (((ServerLevel) (Object) this).isOutsideBuildHeight(pos)) {
             return BlockSnapshot.empty();
         }