From 32d8c1b3416c70a44ce9de6e64d0fb60aec7aa2f Mon Sep 17 00:00:00 2001 From: Tamion <70228790+notTamion@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:15:05 +0200 Subject: [PATCH] 1.21 --- ...nfiguration.patch => 0480-Add-RayTraceConfiguration.patch} | 4 ++-- ...nfiguration.patch => 1041-Add-RayTraceConfiguration.patch} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename patches/api/{0473-Add-RayTraceConfiguration.patch => 0480-Add-RayTraceConfiguration.patch} (98%) rename patches/server/{1046-Add-RayTraceConfiguration.patch => 1041-Add-RayTraceConfiguration.patch} (91%) diff --git a/patches/api/0473-Add-RayTraceConfiguration.patch b/patches/api/0480-Add-RayTraceConfiguration.patch similarity index 98% rename from patches/api/0473-Add-RayTraceConfiguration.patch rename to patches/api/0480-Add-RayTraceConfiguration.patch index 767931102ff7..dafffa2f64d9 100644 --- a/patches/api/0473-Add-RayTraceConfiguration.patch +++ b/patches/api/0480-Add-RayTraceConfiguration.patch @@ -337,10 +337,10 @@ index 0000000000000000000000000000000000000000..ffe49cd1ecc9075315c9695dd1aa4a3f + @NotNull List targets) implements RayTraceConfiguration { +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e..972bee9c2fc9a79c7ab2922b88d567fd03ff831a 100644 +index d8a23aa0d898ca3360757721e38ddb97387f7d21..8ef512986d59f04a9d1fb0ab99ff2fb7f6ec0d8a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1908,6 +1908,33 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -1854,6 +1854,33 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @Nullable RayTraceResult rayTrace(io.papermc.paper.math.@NotNull Position start, @NotNull Vector direction, double maxDistance, @NotNull FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, @Nullable Predicate filter, @Nullable Predicate canCollide); // Paper end diff --git a/patches/server/1046-Add-RayTraceConfiguration.patch b/patches/server/1041-Add-RayTraceConfiguration.patch similarity index 91% rename from patches/server/1046-Add-RayTraceConfiguration.patch rename to patches/server/1041-Add-RayTraceConfiguration.patch index e8170aee5513..1ef4a0c4a304 100644 --- a/patches/server/1046-Add-RayTraceConfiguration.patch +++ b/patches/server/1041-Add-RayTraceConfiguration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add RayTraceConfiguration diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f2b20ed5063a293f0b464548f590d652170cd1d8..b1290a02d06927209c3a25a10be7a34e944eac86 100644 +index 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..447ce81432a4bf18920536038355f29c6e1f2464 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1306,6 +1306,19 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1245,6 +1245,19 @@ public class CraftWorld extends CraftRegionAccessor implements World { return blockHit; }