mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 16:27:47 +00:00
Fix custom climbable blocks not sending a death message (#8372)
Fixes #8370
This commit is contained in:
1 parent
6683e9e660
commit
62b99be117
2 files changed
+11
-8
No files matched your search
@@ -28,6 +28,7 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
@@ -352,13 +353,13 @@ public class ForgeHooks
|
||||
return Math.max(0,event.getVisibilityModifier());
|
||||
}
|
||||
|
||||
public static boolean isLivingOnLadder(@Nonnull BlockState state, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull LivingEntity entity)
|
||||
public static Optional<BlockPos> isLivingOnLadder(@Nonnull BlockState state, @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull LivingEntity entity)
|
||||
{
|
||||
boolean isSpectator = (entity instanceof Player && ((Player)entity).isSpectator());
|
||||
if (isSpectator) return false;
|
||||
boolean isSpectator = (entity instanceof Player && entity.isSpectator());
|
||||
if (isSpectator) return Optional.empty();
|
||||
if (!ForgeConfig.SERVER.fullBoundingBoxLadders.get())
|
||||
{
|
||||
return state.isLadder(world, pos, entity);
|
||||
return state.isLadder(world, pos, entity) ? Optional.of(pos) : Optional.empty();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -376,12 +377,12 @@ public class ForgeHooks
|
||||
state = world.getBlockState(tmp);
|
||||
if (state.isLadder(world, tmp, entity))
|
||||
{
|
||||
return true;
|
||||
return Optional.of(tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user