mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 17:31:06 +01:00
2f92d4e00e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
116 lines
6.2 KiB
Diff
116 lines
6.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TonytheMacaroni <tonythemacaroni123@gmail.com>
|
|
Date: Wed, 6 Sep 2023 19:24:53 -0400
|
|
Subject: [PATCH] Add predicate for blocks when raytracing
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 298e63e0ca9d4cbac3172fd93a217af79fad91df..f72f0f0f8eee95f95adc969d55ba7de82ee30e2a 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -1692,6 +1692,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@Nullable
|
|
public RayTraceResult rayTraceEntities(@NotNull Location start, @NotNull Vector direction, double maxDistance, double raySize, @Nullable Predicate<? super Entity> filter);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Performs a ray trace that checks for entity collisions.
|
|
+ * <p>
|
|
+ * This may not consider entities in currently unloaded chunks. Some
|
|
+ * implementations may impose artificial restrictions on the maximum
|
|
+ * distance.
|
|
+ *
|
|
+ * @param start the start position
|
|
+ * @param direction the ray direction
|
|
+ * @param maxDistance the maximum distance
|
|
+ * @param raySize entity bounding boxes will be uniformly expanded (or
|
|
+ * shrinked) by this value before doing collision checks
|
|
+ * @param filter only entities that fulfill this predicate are considered,
|
|
+ * or <code>null</code> to consider all entities
|
|
+ * @return the closest ray trace hit result, or <code>null</code> if there
|
|
+ * is no hit
|
|
+ */
|
|
+ @Nullable RayTraceResult rayTraceEntities(io.papermc.paper.math.@NotNull Position start, @NotNull Vector direction, double maxDistance, double raySize, @Nullable Predicate<? super Entity> filter);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Performs a ray trace that checks for block collisions using the blocks'
|
|
* precise collision shapes.
|
|
@@ -1755,6 +1776,34 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@Nullable
|
|
public RayTraceResult rayTraceBlocks(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Performs a ray trace that checks for block collisions using the blocks'
|
|
+ * precise collision shapes.
|
|
+ * <p>
|
|
+ * If collisions with passable blocks are ignored, fluid collisions are
|
|
+ * ignored as well regardless of the fluid collision mode.
|
|
+ * <p>
|
|
+ * Portal blocks are only considered passable if the ray starts within
|
|
+ * them. Apart from that collisions with portal blocks will be considered
|
|
+ * even if collisions with passable blocks are otherwise ignored.
|
|
+ * <p>
|
|
+ * This may cause loading of chunks! Some implementations may impose
|
|
+ * artificial restrictions on the maximum distance.
|
|
+ *
|
|
+ * @param start the start position
|
|
+ * @param direction the ray direction
|
|
+ * @param maxDistance the maximum distance
|
|
+ * @param fluidCollisionMode the fluid collision mode
|
|
+ * @param ignorePassableBlocks whether to ignore passable but collidable
|
|
+ * blocks (ex. tall grass, signs, fluids, ..)
|
|
+ * @param canCollide predicate for blocks the ray can potentially collide
|
|
+ * with, or <code>null</code> to consider all blocks
|
|
+ * @return the ray trace hit result, or <code>null</code> if there is no hit
|
|
+ */
|
|
+ @Nullable RayTraceResult rayTraceBlocks(io.papermc.paper.math.@NotNull Position start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, @Nullable Predicate<? super Block> canCollide);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Performs a ray trace that checks for both block and entity collisions.
|
|
* <p>
|
|
@@ -1788,6 +1837,42 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@Nullable
|
|
public RayTraceResult rayTrace(@NotNull Location start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, @Nullable Predicate<? super Entity> filter);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Performs a ray trace that checks for both block and entity collisions.
|
|
+ * <p>
|
|
+ * Block collisions use the blocks' precise collision shapes. The
|
|
+ * <code>raySize</code> parameter is only taken into account for entity
|
|
+ * collision checks.
|
|
+ * <p>
|
|
+ * If collisions with passable blocks are ignored, fluid collisions are
|
|
+ * ignored as well regardless of the fluid collision mode.
|
|
+ * <p>
|
|
+ * Portal blocks are only considered passable if the ray starts within them.
|
|
+ * Apart from that collisions with portal blocks will be considered even if
|
|
+ * collisions with passable blocks are otherwise ignored.
|
|
+ * <p>
|
|
+ * This may cause loading of chunks! Some implementations may impose
|
|
+ * artificial restrictions on the maximum distance.
|
|
+ *
|
|
+ * @param start the start position
|
|
+ * @param direction the ray direction
|
|
+ * @param maxDistance the maximum distance
|
|
+ * @param fluidCollisionMode the fluid collision mode
|
|
+ * @param ignorePassableBlocks whether to ignore passable but collidable
|
|
+ * blocks (ex. tall grass, signs, fluids, ..)
|
|
+ * @param raySize entity bounding boxes will be uniformly expanded (or
|
|
+ * shrinked) by this value before doing collision checks
|
|
+ * @param filter only entities that fulfill this predicate are considered,
|
|
+ * or <code>null</code> to consider all entities
|
|
+ * @param canCollide predicate for blocks the ray can potentially collide
|
|
+ * with, or <code>null</code> to consider all blocks
|
|
+ * @return the closest ray trace hit result with either a block or an
|
|
+ * entity, or <code>null</code> if there is no hit
|
|
+ */
|
|
+ @Nullable RayTraceResult rayTrace(io.papermc.paper.math.@NotNull Position start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, @Nullable Predicate<? super Entity> filter, @Nullable Predicate<? super Block> canCollide);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the default spawn {@link Location} of this world
|
|
*
|