diff --git a/gradle.properties b/gradle.properties index 191ff0e..f935a30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = me.earthme.luminol version = 1.21.1-R0.1-SNAPSHOT -foliaCommit = e402f963b5c4d42921a67c4e789e1718635c8a83 +foliaCommit = 053b04c7a1541cca6cda6f0bd1fb70cd2525c407 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch index 76d1a1b..73d55ec 100644 --- a/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch +++ b/patches/server/0021-Prevent-teleportAsync-calling-during-moving-event-be.patch @@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..8f1449545d6d217b46a9ffae705123da + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a278097ed9a8a6bada11bef1af2eda617f040ea8..e36672e7eb8393f58326091976ac45b5aa905013 100644 +index dafc6723abdd2bf5d566829c547019b62531b4bd..4242fe25e36e45b0a54d3aa7e72fc181728cff74 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -335,6 +335,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -50,7 +50,7 @@ index a278097ed9a8a6bada11bef1af2eda617f040ea8..e36672e7eb8393f58326091976ac45b5 super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); this.chatVisibility = ChatVisiblity.FULL; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 73057c695addefd9c8fa0949743803fdeab60dda..a6a05faf46aa236e6734cfe2f6a90d25cf857c4d 100644 +index 76ab54485b5354c10316ac71ce7073732b397865..828356b9d7ceb7cdc6720d7394c44bd57cb971f1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -686,7 +686,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -63,7 +63,7 @@ index 73057c695addefd9c8fa0949743803fdeab60dda..a6a05faf46aa236e6734cfe2f6a90d25 // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { -@@ -1562,7 +1564,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1557,7 +1559,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl Location oldTo = to.clone(); PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); diff --git a/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index c8a0f19..9a90397 100644 --- a/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0053-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -272,7 +272,7 @@ index 80123dd30328336b02a5e2e3414ece44ba040ad2..6f4d5312c8140e0a49646e4f069b027a } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e36672e7eb8393f58326091976ac45b5aa905013..aa9cd58dab22ffbc1922868e55aedeb6314cebe1 100644 +index 4242fe25e36e45b0a54d3aa7e72fc181728cff74..8c14833675e64548c9c60aa2d07cf5066ba59d3b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -339,6 +339,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -425,10 +425,10 @@ index b3377ed06d703f54e01ba174e5a06dc928cdff96..80af7979f9a2078a6c40c958ced1d487 + // KioCG end } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index c1b0cf6e09914404d1fcf302af03666342e1dc30..dd6c872b8e655119edab5f978067381a287d70ca 100644 +index b6d72a24a61b30b7c4ad967c196c3fbaa9d68ee9..30aa99541b303ecd8eda8f95e628c38434b36640 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -429,4 +429,11 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -435,4 +435,11 @@ public abstract class Projectile extends Entity implements TraceableEntity { return DoubleDoubleImmutablePair.of(d0, d1); } @@ -501,7 +501,7 @@ index 45e262308aebafa377a2353661acdd122933b99e..10b2261169d3cd10d736273fe7703f50 + // KioCG end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 572c85579237afa65ffb3409fa3b70c7f86fcb0f..9097f5c05e625bb798cc1dd030f176cdaee1ddde 100644 +index f1cb17f33363da495c263829efbbd18d4bd192cd..816cc239a5377ea03e1bb748451862560fb1e54f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3585,4 +3585,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/api/0006-Try-fixing-folia-273.patch b/patches/unapplied/0006-Try-fixing-folia-273.patch similarity index 100% rename from patches/api/0006-Try-fixing-folia-273.patch rename to patches/unapplied/0006-Try-fixing-folia-273.patch