diff --git a/patches/api/0463-Add-RayTraceConfiguration.patch b/patches/api/0473-Add-RayTraceConfiguration.patch similarity index 98% rename from patches/api/0463-Add-RayTraceConfiguration.patch rename to patches/api/0473-Add-RayTraceConfiguration.patch index 18678568b7..767931102f 100644 --- a/patches/api/0463-Add-RayTraceConfiguration.patch +++ b/patches/api/0473-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 efa2043e044b0e461780e808c347d6ec00f6da0a..6adb101c0588ab1cbe7047e27f2680db55e647df 100644 +index 97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e..972bee9c2fc9a79c7ab2922b88d567fd03ff831a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1897,6 +1897,33 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -1908,6 +1908,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/1052-Add-RayTraceConfiguration.patch b/patches/server/1046-Add-RayTraceConfiguration.patch similarity index 91% rename from patches/server/1052-Add-RayTraceConfiguration.patch rename to patches/server/1046-Add-RayTraceConfiguration.patch index d018a242ab..e8170aee55 100644 --- a/patches/server/1052-Add-RayTraceConfiguration.patch +++ b/patches/server/1046-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 a139601888b88e8580bdb9c2469386a94abae975..dde99e433632da0b054cf0a28aa1a6080525293c 100644 +index f2b20ed5063a293f0b464548f590d652170cd1d8..b1290a02d06927209c3a25a10be7a34e944eac86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1254,6 +1254,19 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1306,6 +1306,19 @@ public class CraftWorld extends CraftRegionAccessor implements World { return blockHit; }