From 064d0b5595b63588c02e3de53693c6e315730c14 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Thu, 29 May 2025 22:33:34 +0800 Subject: [PATCH] Updated Upstream(Folia) --- gradle.properties | 2 +- .../0013-Add-BlockPos-transform-to-Position-support.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0a92ab3..d7007e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -foliaRef=4f64c32b5cb3310020dd7880bb28c41e444b2c0c +foliaRef=da0d7cd1beb8eb7b84a5210dcefa6ffb4cce7415 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/paper-patches/features/0013-Add-BlockPos-transform-to-Position-support.patch b/luminol-server/paper-patches/features/0013-Add-BlockPos-transform-to-Position-support.patch index 18f8735..8098b14 100644 --- a/luminol-server/paper-patches/features/0013-Add-BlockPos-transform-to-Position-support.patch +++ b/luminol-server/paper-patches/features/0013-Add-BlockPos-transform-to-Position-support.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Add BlockPos transform to Position support diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index eb94f71f626c1f89f1b9048a8e68ae09ff17effc..78fe4d49aa1108ceb180538aeea6d0cede31a58a 100644 +index ff6d200c3c3ecb958086f11dff39357dc0bf70fc..16d95bd30c33d831fd495c65748f6633df5971aa 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java -@@ -162,6 +162,12 @@ public final class MCUtil { - return new org.bukkit.Location(world.getWorld(), pos.x(), pos.y(), pos.z()); +@@ -160,6 +160,12 @@ public final class MCUtil { + return new Location(world.getWorld(), pos.x(), pos.y(), pos.z()); } + // Luminol start - add BlockPos support @@ -20,4 +20,4 @@ index eb94f71f626c1f89f1b9048a8e68ae09ff17effc..78fe4d49aa1108ceb180538aeea6d0ce + /** * Converts a NMS World/Vector to Bukkit Location - * @param world + */