diff --git a/gradle.properties b/gradle.properties index 52f5427..1f8cf36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ release=pre # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -luminolRef=306c3152058211f704ad81e71ae097416d8f8b58 +luminolRef=898a3ea8acd362e125357448fb05ef71042cfe98 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch index 2d077e9..260b141 100644 --- a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch +++ b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-cross-region-damage-trace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable cross region damage trace diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 7c479dea2b33c3a1a4dd72f4d13658ba8c596e42..b7221110c351e2da1fa38121cd582d2307dbf688 100644 +index b4d8cc8b520266abe1921b5e990c34fce3f1d982..93c76c2faf75bf4901ecaba1e04d957d5ddddfca 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1448,6 +1448,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch index 62609b8..8ff1bae 100644 --- a/lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch +++ b/lophine-server/minecraft-patches/features/0015-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b7221110c351e2da1fa38121cd582d2307dbf688..a13b6e60251151295e13d40840096cb002968b82 100644 +index 93c76c2faf75bf4901ecaba1e04d957d5ddddfca..2985d5e2dde049a999a39f6edbb6696332f6d822 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -245,6 +245,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch index 3964478..db0e1da 100644 --- a/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0031-Leaves-Fakeplayer.patch @@ -335,7 +335,7 @@ index e1298bbb83d1d31406c47eaf6d10db3e8d8611ea..41c7179cf2b530d8e4b0fc8161aec75f ServerLevel.this.updateSleepingPlayerList(); } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index a13b6e60251151295e13d40840096cb002968b82..5affc3c101848e689a9044790c0f47f3dc3e214a 100644 +index 2985d5e2dde049a999a39f6edbb6696332f6d822..64943c193ae73795ddf8222a6f71ea5eb1705fe2 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -232,7 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch index 9ac7625..af2d0d4 100644 --- a/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0036-Leaves-Catch-update-suppression-crash.patch @@ -98,7 +98,7 @@ index f4ae59fc4116c0c063effe0c761c69d8c3d33921..e488eb17cac329899b75b329576066da } } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 5affc3c101848e689a9044790c0f47f3dc3e214a..4a22a07cd0e0d81cf7b12a91e75ec78d7d7b9836 100644 +index 64943c193ae73795ddf8222a6f71ea5eb1705fe2..4034b4b9bd5e567b882169b5b1e17f75b64ba8db 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1111,6 +1111,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0045-Carpet-features.patch b/lophine-server/minecraft-patches/features/0045-Carpet-features.patch index 3de3641..7773436 100644 --- a/lophine-server/minecraft-patches/features/0045-Carpet-features.patch +++ b/lophine-server/minecraft-patches/features/0045-Carpet-features.patch @@ -128,7 +128,7 @@ index 8cc4fe9feb57902a4b9a6a26e6175ac00a2cef65..9ab1a812e43145120859734075e2ac99 // Paper start - fix converting txt to json file; moved from constructor } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4a22a07cd0e0d81cf7b12a91e75ec78d7d7b9836..82a9143d43425943d6b730c8a43446881061ac2c 100644 +index 4034b4b9bd5e567b882169b5b1e17f75b64ba8db..e5fdb195aaea5d4041d2fd33e3f96966ef1c5412 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -260,6 +260,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch b/lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch index 039a814..63fca0c 100644 --- a/lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch +++ b/lophine-server/minecraft-patches/features/0046-Carpet-Features-Compatible.patch @@ -53,7 +53,7 @@ index 03f3fe221b14f0317947d74e25049bcce2ebeb66..6882e85fb6413e5c346c189a82b69f3e } // Luminol end - Add a config to enable tick command diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 82a9143d43425943d6b730c8a43446881061ac2c..e764440aed35868c6c8617505ee84dc9e61aa9f3 100644 +index e5fdb195aaea5d4041d2fd33e3f96966ef1c5412..4c53b688ed6b26ca7231841f3235f9a824416bba 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -2169,7 +2169,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch index 1aaf6b1..d28e889 100644 --- a/lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch +++ b/lophine-server/minecraft-patches/features/0048-Add-Vanilla-like-experience-Config.patch @@ -21,7 +21,7 @@ index dd17339fe2f9d7660b20eed05b61d6231302aa82..d997e4f7ae6ee4e81f5fffe874f2895d } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index e764440aed35868c6c8617505ee84dc9e61aa9f3..030fcda892780afb931615d948905d594872cf87 100644 +index 4c53b688ed6b26ca7231841f3235f9a824416bba..cef9c7887332b91e2466a97a5250db81f7af0dcf 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -2360,7 +2360,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch index c304ba4..85f82c1 100644 --- a/lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch +++ b/lophine-server/minecraft-patches/features/0049-Restore-vanilla-ender-pearl-loading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Restore vanilla ender pearl loading diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 030fcda892780afb931615d948905d594872cf87..b567567379a66e96f5392ea2c735a402cb58b352 100644 +index cef9c7887332b91e2466a97a5250db81f7af0dcf..a17212c1910ce9490fe8df8c4ef507e25b89c545 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -277,7 +277,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc