Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-18 04:20:08 +01:00
31699ae9a8
* Updated Upstream (Bukkit/CraftBukkit) 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: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
117 Zeilen
6.2 KiB
Diff
117 Zeilen
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 5785dda1127106b529f0784df524e120aaf87f4f..c0ad21a3dd1f3cd9a4c66000e937e89ffc183638 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -1694,6 +1694,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.
|
|
@@ -1757,6 +1778,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>
|
|
@@ -1790,6 +1839,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
|
|
*
|