diff --git a/gradle.properties b/gradle.properties index b7e063d..ea1ac82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=wtf.etil.mirai version=1.18.1-R0.1-SNAPSHOT mcVersion=1.18.1 packageVersion=1_18_R1 -pufferfishRef=110966ec14ddce354d8f1d3c28939025cfa86ab3 +pufferfishRef=bcbaf3e4dec81c89a226508984da4c1beb1f9e74 org.gradle.caching=true org.gradle.caching.debug=false diff --git a/patches/api/0010-Skip-event-if-no-listeners.patch b/patches/api/0009-Skip-event-if-no-listeners.patch similarity index 95% rename from patches/api/0010-Skip-event-if-no-listeners.patch rename to patches/api/0009-Skip-event-if-no-listeners.patch index 4030093..5c94787 100644 --- a/patches/api/0010-Skip-event-if-no-listeners.patch +++ b/patches/api/0009-Skip-event-if-no-listeners.patch @@ -7,7 +7,7 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0 You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/build.gradle.kts b/build.gradle.kts -index 2c33800e7a49804a29f64fd5e6fde7d2c860ef4c..03bad379b8d8c15567a1fdae06b8da6ba567d189 100644 +index 62e071edc3128b128c5ff631606eb1466ae34ef2..31346c12d1c72cdec89dffbe07106e37c47fbb4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { diff --git a/patches/api/0009-World-Instance-Flag.patch b/patches/api/0009-World-Instance-Flag.patch deleted file mode 100644 index 8ce4719..0000000 --- a/patches/api/0009-World-Instance-Flag.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Mon, 18 Oct 2021 08:52:40 -0500 -Subject: [PATCH] World Instance Flag - -Original code by Cryptite, licensed under MIT -You can find the original code on https://github.com/Cryptite/Slice - -diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 1f8a51897d9de00f0004ab1de479198390483f7d..306aba5984872ec930ffb69d60c11475a089b7a5 100644 ---- a/src/main/java/org/bukkit/World.java -+++ b/src/main/java/org/bukkit/World.java -@@ -2606,6 +2606,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient - */ - public void setAutoSave(boolean value); - -+ // Slice start -+ public boolean isInstance(); -+ public void setInstance(boolean value); -+ // Slice end -+ - /** - * Sets the Difficulty of the world. - * diff --git a/patches/api/0011-disable-AnnotationTest.patch b/patches/api/0010-disable-AnnotationTest.patch similarity index 100% rename from patches/api/0011-disable-AnnotationTest.patch rename to patches/api/0010-disable-AnnotationTest.patch diff --git a/patches/server/0001-Mirai-Branding-Changes.patch b/patches/server/0001-Mirai-Branding-Changes.patch index 456c297..6fce7a3 100644 --- a/patches/server/0001-Mirai-Branding-Changes.patch +++ b/patches/server/0001-Mirai-Branding-Changes.patch @@ -205,10 +205,10 @@ index adafc4fd661cf080b004b86c3eaed231a0133101..00000000000000000000000000000000 -} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1e7ae166a1d53fce28297e2eaebd11ec28a57a55..819fc4b53b5f2f9dc9c25641be644218d3d4f460 100644 +index 3ec35d19f63832ee465a54518219184a14bb08e2..1d5cee5cae732fbe9181cb3cecc68ec980257248 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1711,7 +1711,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]); OptionSpec optionspec12 = optionparser.accepts("serverId").withRequiredArg(); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 91e5784cf6552fc9cfab371756751ea73e206ec1..4fbb9110ce27df22df141fb2c123abf172e51bac 100644 +index addf249717b5271b664f4a9d28dd6cc177db5688..99a86acedeed4aede7e7afc7e9ee122b78201c7e 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -76,6 +76,8 @@ public class ServerChunkCache extends ChunkSource { +@@ -77,6 +77,8 @@ public class ServerChunkCache extends ChunkSource { final com.destroystokyo.paper.util.concurrent.WeakSeqLock loadedChunkMapSeqLock = new com.destroystokyo.paper.util.concurrent.WeakSeqLock(); final Long2ObjectOpenHashMap loadedChunkMap = new Long2ObjectOpenHashMap<>(8192, 0.5f); @@ -222,7 +222,7 @@ index 91e5784cf6552fc9cfab371756751ea73e206ec1..4fbb9110ce27df22df141fb2c123abf1 private final LevelChunk[] lastLoadedChunks = new LevelChunk[4 * 4]; public boolean firstRunSpawnCounts = true; // Pufferfish -@@ -933,6 +935,16 @@ public class ServerChunkCache extends ChunkSource { +@@ -928,6 +930,16 @@ public class ServerChunkCache extends ChunkSource { this.clearCache(); } @@ -239,7 +239,7 @@ index 91e5784cf6552fc9cfab371756751ea73e206ec1..4fbb9110ce27df22df141fb2c123abf1 private void tickChunks() { long i = this.level.getGameTime(); long j = i - this.lastInhabitedUpdate; -@@ -1024,7 +1036,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -1019,7 +1031,7 @@ public class ServerChunkCache extends ChunkSource { iterator1 = this.entityTickingChunks.iterator(); } else { iterator1 = this.entityTickingChunks.unsafeIterator(); @@ -262,10 +262,10 @@ index e80176708db486190dd527e3ade5fc690ceb39f7..4fa44b576404438d08085e1d8c82fa96 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 8cdacd7ed9a26e6757eeff89545fde21ddb80fd2..75b885da98b308ed8894fc95e604076d8593461e 100644 +index 59d57108f38f38e03cd8b69a53c3e9d40179599a..a0857991d64d89874fea552a5459a45f14529034 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -846,7 +846,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -849,7 +849,7 @@ public class ServerLevel extends Level implements WorldGenLevel { BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ); BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw); @@ -274,7 +274,7 @@ index 8cdacd7ed9a26e6757eeff89545fde21ddb80fd2..75b885da98b308ed8894fc95e604076d // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock). // TODO CHECK ON UPDATE } -@@ -1099,7 +1099,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1102,7 +1102,7 @@ public class ServerLevel extends Level implements WorldGenLevel { public static List getCurrentlyTickingEntities() { Entity ticking = currentlyTickingEntity.get(); @@ -332,7 +332,7 @@ index 5d8e9bdf5538b19681f21949368d862fab8a89ad..97c744508cc535418eba65fa722859c8 public ZeroBitStorage(int size) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a6681690e1e556440320c492bf2a8e617008baa1..5b0a904673db2eb98296807730ce9454b8740aa9 100644 +index 3236a1dc51c394b784d3f42b78e76bf7c2f69c37..3556586c8cd24827bf7b1018c426e258f0f6444d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3020,7 +3020,7 @@ public abstract class LivingEntity extends Entity { @@ -486,7 +486,7 @@ index 2f9f15d99f8b31e9f13f7f32378b2a9e09bcb5e5..aa565ab33700c92ca607463bdc0dcaef @Override diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 90aa1d75b5c23e5ee27ceae9f6ef90de913a6601..364ecdbe5bbe837b76451bb032fc52f41d8e0dca 100644 +index a98d115b7dccd836fa2c0f50333730db6f388aff..33dfda7f4b03c4782cfcf4cc9f36dc26b64fd6d5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -111,7 +111,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -506,7 +506,7 @@ index 90aa1d75b5c23e5ee27ceae9f6ef90de913a6601..364ecdbe5bbe837b76451bb032fc52f4 } return slices.getChunkEntities(); } -@@ -1299,7 +1298,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1304,7 +1303,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public int getBestNeighborSignal(BlockPos pos) { int i = 0; @@ -883,10 +883,10 @@ index c9c18cf84e4ee5c253bbc64a4b41e91f9f4c4bc7..6ec908eda3855b926958cd546acd9055 j = aenumdirection1.length; diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 05c46f3b3bce5225b819d86e6e06729a5093e092..d17fb373c43b9bc3c18e3b34fd5f70d95d4d3215 100644 +index eac017fc521bfd1391e75db8628f42b28329d681..101763868fcfa8f0e428b3b7f36983d21d20f9ff 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -1080,7 +1080,7 @@ public abstract class BlockBehaviour { +@@ -1115,7 +1115,7 @@ public abstract class BlockBehaviour { private static final class Cache { @@ -895,7 +895,7 @@ index 05c46f3b3bce5225b819d86e6e06729a5093e092..d17fb373c43b9bc3c18e3b34fd5f70d9 private static final int SUPPORT_TYPE_COUNT = SupportType.values().length; protected final boolean solidRender; final boolean propagatesSkylightDown; -@@ -1120,7 +1120,7 @@ public abstract class BlockBehaviour { +@@ -1155,7 +1155,7 @@ public abstract class BlockBehaviour { if (!this.collisionShape.isEmpty() && block.getOffsetType() != BlockBehaviour.OffsetType.NONE) { throw new IllegalStateException(String.format("%s has a collision shape and an offset type, but is not marked as dynamicShape in its properties.", Registry.BLOCK.getKey(block))); } else { diff --git a/patches/server/0015-Remove-TickTask.patch b/patches/server/0015-Remove-TickTask.patch index 16ba597..dc1c2e0 100644 --- a/patches/server/0015-Remove-TickTask.patch +++ b/patches/server/0015-Remove-TickTask.patch @@ -7,7 +7,7 @@ Original code by PatinaMC, licensed under GNU General Public License v3.0 You can find the original code on https://github.com/PatinaMC/Patina diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5830bda766ea88bb45096d900afe76600ce2f9e0..33374b3b50d4c8289f4f17fba4bcb52ec6ad61db 100644 +index babc3235c8e7d1e45c21e42184a4c1a13485d950..8d511ce78d6a7d305cb158482ebe3946e7e210fa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -186,7 +186,7 @@ import org.bukkit.event.server.ServerLoadEvent; @@ -43,7 +43,7 @@ index 5830bda766ea88bb45096d900afe76600ce2f9e0..33374b3b50d4c8289f4f17fba4bcb52e @Override public boolean pollTask() { -@@ -1410,10 +1412,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop optional = Optional.of(this.getFile("server-icon.png")).filter(File::isFile); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 401326bfd610302a5b073cec646b435a861ad109..325ad14a55fbcfde73c061a03ca3592196360363 100644 +index 99a86acedeed4aede7e7afc7e9ee122b78201c7e..4c853c5fd3251c177d31048df545ed55f57cc6ee 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -1270,10 +1270,12 @@ public class ServerChunkCache extends ChunkSource { +@@ -1276,10 +1276,12 @@ public class ServerChunkCache extends ChunkSource { return runnable; } diff --git a/patches/server/0022-Better-handling-of-async-tasks.patch b/patches/server/0022-Better-handling-of-async-tasks.patch index bf5e667..7a67ce3 100644 --- a/patches/server/0022-Better-handling-of-async-tasks.patch +++ b/patches/server/0022-Better-handling-of-async-tasks.patch @@ -7,7 +7,7 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0 You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index f99d189f461921d37581e2fc1382af60921b0660..cd9d39b0ab5aad07ac87df0bdd665be45db2b519 100644 +index d6a57cdad2c92521a800cb18d060d9d6d627a8c0..0ace819f156ac4a50660d9bcb257d633f2c39b14 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -53,11 +53,14 @@ import java.util.concurrent.atomic.AtomicBoolean; @@ -59,7 +59,7 @@ index f99d189f461921d37581e2fc1382af60921b0660..cd9d39b0ab5aad07ac87df0bdd665be4 public static Runnable once(Runnable run) { AtomicBoolean ran = new AtomicBoolean(false); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 33374b3b50d4c8289f4f17fba4bcb52ec6ad61db..99cb51ad54f7a6ed63d392070a7dd6903c1676de 100644 +index 8d511ce78d6a7d305cb158482ebe3946e7e210fa..19fb9fe02ef029aecec00dc02f72a2b4a2cda48b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -372,6 +372,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8cac6f49b23841414fbcc7f3a158a7342b382496..53620ae30370482ffa698bf8c0f662141dcede84 100644 +index a5ccc1b3c7cef43527556c33d846cc9904e3ab8b..60dbed75f29777f8ffcd1349549be75729d48be1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1596,7 +1596,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1626,7 +1626,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/patches/server/0050-Alternative-Keepalive-Handling.patch b/patches/server/0050-Alternative-Keepalive-Handling.patch index 1aaa14f..afd4d06 100644 --- a/patches/server/0050-Alternative-Keepalive-Handling.patch +++ b/patches/server/0050-Alternative-Keepalive-Handling.patch @@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT You can find the original code on https://github.com/PurpurMC/Purpur diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1550b254be950be2183387b82761067539b8364a..4e0ea5943952ec32ad88c935d7b0259e2eb096e6 100644 +index 65833c8f66858b7f98ffbd06f097e50169d5a300..022b2bb3f13b45618889e7b09e4499ee79331118 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -40,7 +40,7 @@ index 1550b254be950be2183387b82761067539b8364a..4e0ea5943952ec32ad88c935d7b0259e if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3103,6 +3119,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3109,6 +3125,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0056-Signs-allow-color-codes.patch b/patches/server/0056-Signs-allow-color-codes.patch index 35165a5..21f2299 100644 --- a/patches/server/0056-Signs-allow-color-codes.patch +++ b/patches/server/0056-Signs-allow-color-codes.patch @@ -7,7 +7,7 @@ Original code by PurpurMC, licensed under MIT You can find the original code on https://github.com/PurpurMC/Purpur diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ade6a3d0e90e8c82e3e90bd2d12369ccd0760eca..c93c3c3f83a60aa1769607a26148f2eb754cbda6 100644 +index 8eabffbfa852773c28702c2c2dd3b124b24e8ae2..0eddb9829788ab7c9bf72805bc46a24152c4a7a1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1460,6 +1460,7 @@ public class ServerPlayer extends Player { @@ -19,10 +19,10 @@ index ade6a3d0e90e8c82e3e90bd2d12369ccd0760eca..c93c3c3f83a60aa1769607a26148f2eb this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4e0ea5943952ec32ad88c935d7b0259e2eb096e6..8baa1ee0073b21954dd40109155d10ea9f373017 100644 +index 022b2bb3f13b45618889e7b09e4499ee79331118..8d50853d35f2d880bf8eb17ea0780dc2c9b1a367 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3093,11 +3093,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3099,11 +3099,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } // Paper end diff --git a/patches/server/0065-Packet-obfuscation-and-reduction.patch b/patches/server/0065-Packet-obfuscation-and-reduction.patch index 20a8587..85ecf70 100644 --- a/patches/server/0065-Packet-obfuscation-and-reduction.patch +++ b/patches/server/0065-Packet-obfuscation-and-reduction.patch @@ -184,10 +184,10 @@ index d85da02be7f1d494af8f2cc840c49073774f5f9c..aaf3a82c57b92b53d6bd737a4e20c91b @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 53620ae30370482ffa698bf8c0f662141dcede84..3a57ba15d14071ca38536b602fa2547bce7a0795 100644 +index 60dbed75f29777f8ffcd1349549be75729d48be1..3820a4c379a2c006d0cb179c931fc4da12b2adda 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2066,7 +2066,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2096,7 +2096,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.sendHealthUpdate(); } } diff --git a/patches/server/0066-Smooth-World-Teleports.patch b/patches/server/0066-Smooth-World-Teleports.patch deleted file mode 100644 index 149f217..0000000 --- a/patches/server/0066-Smooth-World-Teleports.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Sun, 10 Oct 2021 13:36:38 -0500 -Subject: [PATCH] Smooth World Teleports - -Original code by Cryptite, licensed under MIT -You can find the original code on https://github.com/Cryptite/Slice - -diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c93c3c3f83a60aa1769607a26148f2eb754cbda6..c0301008fecdae18ade4c05115a60f965f9b89cd 100644 ---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java -+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -258,6 +258,7 @@ public class ServerPlayer extends Player { - public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks - public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper - public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event -+ public boolean smoothWorldTeleport; // Slice - - public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { - super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); -diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1e1f35df11f25dcd471cb3d918c9dfb70a35755a..4b7f804b6dfe96c49444c0afcebfcc857440c7e6 100644 ---- a/src/main/java/net/minecraft/server/players/PlayerList.java -+++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -953,12 +953,12 @@ public abstract class PlayerList { - } - // CraftBukkit start - LevelData worlddata = worldserver1.getLevelData(); -- entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag)); -+ if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag)); - entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.spigotConfig.viewDistance)); // Spigot - entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.spigotConfig.simulationDistance)); // Spigot - entityplayer1.spawnIn(worldserver1); - entityplayer1.unsetRemoved(); -- entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot())); -+ if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot())); - entityplayer1.setShiftKeyDown(false); - - // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()); diff --git a/patches/server/0068-lithium-cached-hashcode.patch b/patches/server/0066-lithium-cached-hashcode.patch similarity index 100% rename from patches/server/0068-lithium-cached-hashcode.patch rename to patches/server/0066-lithium-cached-hashcode.patch diff --git a/patches/server/0069-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch b/patches/server/0067-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch similarity index 100% rename from patches/server/0069-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch rename to patches/server/0067-PaperPR-Fix-mobs-spawning-outside-hard-despawn-range.patch diff --git a/patches/server/0067-World-Instance-Flag.patch b/patches/server/0067-World-Instance-Flag.patch deleted file mode 100644 index b4ec5a0..0000000 --- a/patches/server/0067-World-Instance-Flag.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cryptite -Date: Mon, 18 Oct 2021 08:52:40 -0500 -Subject: [PATCH] World Instance Flag - -Original code by Cryptite, licensed under MIT -You can find the original code on https://github.com/Cryptite/Slice - -diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 75b885da98b308ed8894fc95e604076d8593461e..751faa74604edd15a1f8223043d9fe188f7375a8 100644 ---- a/src/main/java/net/minecraft/server/level/ServerLevel.java -+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -211,6 +211,7 @@ public class ServerLevel extends Level implements WorldGenLevel { - public final UUID uuid; - public boolean hasPhysicsEvent = true; // Paper - public boolean hasEntityMoveEvent = false; // Paper -+ public boolean instance; // Slice - public static Throwable getAddToWorldStackTrace(Entity entity) { - return new Throwable(entity + " Added to world at " + new java.util.Date()); - } -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e8c5c0c6e05194707db35246444e4a44878a227b..27e817f805faf0bc882f75649dd4efeaf4067a2d 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1227,6 +1227,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { - world.noSave = !value; - } - -+ // Slice start -+ @Override -+ public boolean isInstance() { -+ return world.instance; -+ } -+ -+ @Override -+ public void setInstance(boolean value) { -+ world.instance = value; -+ } -+ // Slice end -+ - @Override - public void setDifficulty(Difficulty difficulty) { - this.getHandle().serverLevelData.setDifficulty(net.minecraft.world.Difficulty.byId(difficulty.getValue())); diff --git a/patches/server/0070-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0068-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0070-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0068-PaperPR-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0071-lithium-chunk-structure-storage.patch b/patches/server/0069-lithium-chunk-structure-storage.patch similarity index 100% rename from patches/server/0071-lithium-chunk-structure-storage.patch rename to patches/server/0069-lithium-chunk-structure-storage.patch diff --git a/patches/server/0072-lithium-ai-task-goat-jump.patch b/patches/server/0070-lithium-ai-task-goat-jump.patch similarity index 100% rename from patches/server/0072-lithium-ai-task-goat-jump.patch rename to patches/server/0070-lithium-ai-task-goat-jump.patch diff --git a/patches/server/0073-lithium-store-gamerules-in-fastutil-hashmap.patch b/patches/server/0071-lithium-store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0073-lithium-store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0071-lithium-store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0074-lithium-skipping-steps-in-voronoi-using-prediction.patch b/patches/server/0072-lithium-skipping-steps-in-voronoi-using-prediction.patch similarity index 100% rename from patches/server/0074-lithium-skipping-steps-in-voronoi-using-prediction.patch rename to patches/server/0072-lithium-skipping-steps-in-voronoi-using-prediction.patch diff --git a/patches/server/0075-Skip-enchanting-table-book-tick.patch b/patches/server/0073-Skip-enchanting-table-book-tick.patch similarity index 100% rename from patches/server/0075-Skip-enchanting-table-book-tick.patch rename to patches/server/0073-Skip-enchanting-table-book-tick.patch diff --git a/patches/server/0076-Skip-cloning-loot-parameters.patch b/patches/server/0074-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0076-Skip-cloning-loot-parameters.patch rename to patches/server/0074-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0077-PaperPR-Fix-entity-position-desync.patch b/patches/server/0075-PaperPR-Fix-entity-position-desync.patch similarity index 100% rename from patches/server/0077-PaperPR-Fix-entity-position-desync.patch rename to patches/server/0075-PaperPR-Fix-entity-position-desync.patch diff --git a/patches/server/0078-lithium-precompute-shape-arrays.patch b/patches/server/0076-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0078-lithium-precompute-shape-arrays.patch rename to patches/server/0076-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0079-vmp-ingredient_matching.patch b/patches/server/0077-vmp-ingredient_matching.patch similarity index 100% rename from patches/server/0079-vmp-ingredient_matching.patch rename to patches/server/0077-vmp-ingredient_matching.patch diff --git a/patches/server/0080-Fix-MC-121706.patch b/patches/server/0078-Fix-MC-121706.patch similarity index 100% rename from patches/server/0080-Fix-MC-121706.patch rename to patches/server/0078-Fix-MC-121706.patch diff --git a/patches/server/0081-vmp-entity.iteration.patch b/patches/server/0079-vmp-entity.iteration.patch similarity index 100% rename from patches/server/0081-vmp-entity.iteration.patch rename to patches/server/0079-vmp-entity.iteration.patch diff --git a/patches/server/0082-vmp-spawn_density_cap.patch b/patches/server/0080-vmp-spawn_density_cap.patch similarity index 100% rename from patches/server/0082-vmp-spawn_density_cap.patch rename to patches/server/0080-vmp-spawn_density_cap.patch diff --git a/patches/server/0083-Configurable-server-metrics.patch b/patches/server/0081-Configurable-server-metrics.patch similarity index 94% rename from patches/server/0083-Configurable-server-metrics.patch rename to patches/server/0081-Configurable-server-metrics.patch index 8ba68b1..6a37c9d 100644 --- a/patches/server/0083-Configurable-server-metrics.patch +++ b/patches/server/0081-Configurable-server-metrics.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server metrics diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 8d205a841c2d77dd57e1f2d189686f6f7426896c..96e2ae4443fc07fd678d6f7bca900b28960d430b 100644 +index 499d5d5a35323571571911969cc9bac3b90cec99..b1589f65b6a4464c2c5dc450693505673fc89077 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -123,7 +123,7 @@ public class PaperConfig { diff --git a/patches/server/0084-Configurable-FastMath.round.patch b/patches/server/0082-Configurable-FastMath.round.patch similarity index 99% rename from patches/server/0084-Configurable-FastMath.round.patch rename to patches/server/0082-Configurable-FastMath.round.patch index 608c004..d4a4b7a 100644 --- a/patches/server/0084-Configurable-FastMath.round.patch +++ b/patches/server/0082-Configurable-FastMath.round.patch @@ -100,7 +100,7 @@ index 40447d00aefb5ffedb8a2ee87155a04088f0649f..31cc0a29e89e79f616b3ee329a552896 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8595b31137db798b6ae8969970e607459593d39d..944b4b288fd3f3d3160eeb73ae9060ef9d224b7a 100644 +index eaf775072e4782db6f05d12b7c8e4184d13c661e..79936ad8196846e187f8153c15cd8a3e21380876 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -393,7 +393,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { +@@ -304,7 +304,7 @@ public class Connection extends SimpleChannelInboundHandler> { } public void setListener(PacketListener listener) { @@ -29,10 +29,10 @@ index 81dde0efc1a06420c0791520b9e40b24dd1f0318..371dd89f91f5b53e7d31155e22a4f29b } // Paper start diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 944b4b288fd3f3d3160eeb73ae9060ef9d224b7a..efb3020e81a02d79ad07ceccd8d28ff94d883ad4 100644 +index 79936ad8196846e187f8153c15cd8a3e21380876..cb074736f3d547fa188c65da0db7a344ec5f7fa9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1441,8 +1441,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop com.destroystokyo.paper.PaperConfig.autoRecipeLimit) { @@ -104,7 +104,7 @@ index 6006b9b824eee427712c5eafc67788982fc64936..a53f2210409410ba2b0edbd479ed8ab2 final String s; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 4b7f804b6dfe96c49444c0afcebfcc857440c7e6..20f48a3d3a5d454aa6109557c031043210404726 100644 +index 4feddab26597b67edc4f79e10d41a88d96f16b37..ddd687336a727b164b5f4c566e02b3ad50b26dad 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -316,7 +316,7 @@ public abstract class PlayerList { diff --git a/patches/server/0088-PaperPR-Don-t-tick-markers.patch b/patches/server/0086-PaperPR-Don-t-tick-markers.patch similarity index 94% rename from patches/server/0088-PaperPR-Don-t-tick-markers.patch rename to patches/server/0086-PaperPR-Don-t-tick-markers.patch index 7b9a55a..d20dbc6 100644 --- a/patches/server/0088-PaperPR-Don-t-tick-markers.patch +++ b/patches/server/0086-PaperPR-Don-t-tick-markers.patch @@ -22,10 +22,10 @@ index 2e141e7b85ef54a084698b5a920b85212271fce8..6b843f9fba6c26b1581be114d6f255a6 } }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 751faa74604edd15a1f8223043d9fe188f7375a8..434dacbabdf0f6bec9fa84d2f57d605b50e6d812 100644 +index a0857991d64d89874fea552a5459a45f14529034..b836f61a7b5490dea6a531a7e7342ff986194485 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2406,6 +2406,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2408,6 +2408,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } public void onTickingStart(Entity entity) { diff --git a/patches/server/0089-PaperPR-Add-Alternate-Current-redstone-implementatio.patch b/patches/server/0087-PaperPR-Add-Alternate-Current-redstone-implementatio.patch similarity index 99% rename from patches/server/0089-PaperPR-Add-Alternate-Current-redstone-implementatio.patch rename to patches/server/0087-PaperPR-Add-Alternate-Current-redstone-implementatio.patch index 8a2c494..552e963 100644 --- a/patches/server/0089-PaperPR-Add-Alternate-Current-redstone-implementatio.patch +++ b/patches/server/0087-PaperPR-Add-Alternate-Current-redstone-implementatio.patch @@ -2003,7 +2003,7 @@ index 0000000000000000000000000000000000000000..5d58615073c2b2018a3625544e7e702c +} \ No newline at end of file diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 96e2ae4443fc07fd678d6f7bca900b28960d430b..9d7215f87f6f77def478dc223d94993c9103e1a1 100644 +index b1589f65b6a4464c2c5dc450693505673fc89077..354e764de71b95a6287f5d50c9d2a2b21dd548ac 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -71,8 +71,8 @@ public class PaperConfig { @@ -2067,7 +2067,7 @@ index d7dcf36c8c972e30320c56e447822cf26f6d5fb3..d7913e8ce46b38d9e2e345c33ecf63f6 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 434dacbabdf0f6bec9fa84d2f57d605b50e6d812..5acd60a388dca9438d215182cba53ed17ee4a488 100644 +index b836f61a7b5490dea6a531a7e7342ff986194485..fd50a81c6cce512e5c7fa47f5e6ab7ab131c575c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -161,9 +161,14 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -2085,7 +2085,7 @@ index 434dacbabdf0f6bec9fa84d2f57d605b50e6d812..5acd60a388dca9438d215182cba53ed1 public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0); private static final int MIN_RAIN_DELAY_TIME = 12000; private static final int MAX_RAIN_DELAY_TIME = 180000; -@@ -225,6 +230,12 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -224,6 +229,12 @@ public class ServerLevel extends Level implements WorldGenLevel { return convertable.dimensionType; } diff --git a/patches/server/0090-lithium-entity.fast_elytra_check.patch b/patches/server/0088-lithium-entity.fast_elytra_check.patch similarity index 90% rename from patches/server/0090-lithium-entity.fast_elytra_check.patch rename to patches/server/0088-lithium-entity.fast_elytra_check.patch index 8523d15..5e2de68 100644 --- a/patches/server/0090-lithium-entity.fast_elytra_check.patch +++ b/patches/server/0088-lithium-entity.fast_elytra_check.patch @@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1350e1cd84312b93da26f6bc49fd9bad6b0dd606..59cfc449a229742e96975b2827a986d706cf88a9 100644 +index d0a3dac7920d309eefdb72e888817f282662bf0a..30fdf60cf255414f5efe8d842f291f74892629bc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3370,6 +3370,8 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0091-lithium-profiler.patch b/patches/server/0089-lithium-profiler.patch similarity index 87% rename from patches/server/0091-lithium-profiler.patch rename to patches/server/0089-lithium-profiler.patch index b469ae6..c7b2aab 100644 --- a/patches/server/0091-lithium-profiler.patch +++ b/patches/server/0089-lithium-profiler.patch @@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5acd60a388dca9438d215182cba53ed17ee4a488..545f49551d42ec403d4ed2babfa85cbd81934b95 100644 +index fd50a81c6cce512e5c7fa47f5e6ab7ab131c575c..91317d79ce86368aa1826cafe7fa0de41b04a569 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -221,6 +221,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -220,6 +220,13 @@ public class ServerLevel extends Level implements WorldGenLevel { return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/patches/server/0092-lithium-entity.fast_hand_swing.patch b/patches/server/0090-lithium-entity.fast_hand_swing.patch similarity index 90% rename from patches/server/0092-lithium-entity.fast_hand_swing.patch rename to patches/server/0090-lithium-entity.fast_hand_swing.patch index ce09f89..dad0169 100644 --- a/patches/server/0092-lithium-entity.fast_hand_swing.patch +++ b/patches/server/0090-lithium-entity.fast_hand_swing.patch @@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 59cfc449a229742e96975b2827a986d706cf88a9..0138dc48214ab05222c9349c0ad4112cd9f80dc6 100644 +index 30fdf60cf255414f5efe8d842f291f74892629bc..2b84a6a38459b715a415a183ca40697d4f8fbf72 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2419,6 +2419,8 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0093-c2me-optimization.math.patch b/patches/server/0091-c2me-optimization.math.patch similarity index 100% rename from patches/server/0093-c2me-optimization.math.patch rename to patches/server/0091-c2me-optimization.math.patch diff --git a/patches/server/0094-lithium-entity.fast_powder_snow_check.patch b/patches/server/0092-lithium-entity.fast_powder_snow_check.patch similarity index 94% rename from patches/server/0094-lithium-entity.fast_powder_snow_check.patch rename to patches/server/0092-lithium-entity.fast_powder_snow_check.patch index 380f734..c488267 100644 --- a/patches/server/0094-lithium-entity.fast_powder_snow_check.patch +++ b/patches/server/0092-lithium-entity.fast_powder_snow_check.patch @@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0138dc48214ab05222c9349c0ad4112cd9f80dc6..dc1705d25bcace45b9ca3aa40c2d10a1fcbf7bec 100644 +index 2b84a6a38459b715a415a183ca40697d4f8fbf72..b7c6dd25e439d24719c8f663c7a448854dc6ee7a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -564,11 +564,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0095-lithium-collections.attributes.patch b/patches/server/0093-lithium-collections.attributes.patch similarity index 100% rename from patches/server/0095-lithium-collections.attributes.patch rename to patches/server/0093-lithium-collections.attributes.patch diff --git a/patches/server/0096-c2me-vectorizations.vectorize_noise.patch b/patches/server/0094-c2me-vectorizations.vectorize_noise.patch similarity index 100% rename from patches/server/0096-c2me-vectorizations.vectorize_noise.patch rename to patches/server/0094-c2me-vectorizations.vectorize_noise.patch diff --git a/patches/server/0097-lithium-collections.entity_by_type.patch b/patches/server/0095-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0097-lithium-collections.entity_by_type.patch rename to patches/server/0095-lithium-collections.entity_by_type.patch diff --git a/patches/server/0098-lithium-collections.entity_filtering.patch b/patches/server/0096-lithium-collections.entity_filtering.patch similarity index 100% rename from patches/server/0098-lithium-collections.entity_filtering.patch rename to patches/server/0096-lithium-collections.entity_filtering.patch diff --git a/patches/server/0099-lithium-chunk.serialization.patch b/patches/server/0097-lithium-chunk.serialization.patch similarity index 100% rename from patches/server/0099-lithium-chunk.serialization.patch rename to patches/server/0097-lithium-chunk.serialization.patch diff --git a/patches/server/0100-lithium-world.inline_height.patch b/patches/server/0098-lithium-world.inline_height.patch similarity index 95% rename from patches/server/0100-lithium-world.inline_height.patch rename to patches/server/0098-lithium-world.inline_height.patch index 3e4efcb..160ffcb 100644 --- a/patches/server/0100-lithium-world.inline_height.patch +++ b/patches/server/0098-lithium-world.inline_height.patch @@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 9e9cdabefce3767a2e482f7cc5eb69c635ea17a7..f601a8a9c826c42c43c0b8bd65c2bf3d10bc5001 100644 +index 087be9acfa77d3fd0216e5983aa62149e668cfc7..9e0b041dc917b01847e16d56984b913e0dff3e49 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -76,6 +76,54 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0101-hydrogen.patch b/patches/server/0099-hydrogen.patch similarity index 100% rename from patches/server/0101-hydrogen.patch rename to patches/server/0099-hydrogen.patch diff --git a/patches/server/0102-Configurable-criterion-triggers.patch b/patches/server/0100-Configurable-criterion-triggers.patch similarity index 90% rename from patches/server/0102-Configurable-criterion-triggers.patch rename to patches/server/0100-Configurable-criterion-triggers.patch index eba9c41..2150e93 100644 --- a/patches/server/0102-Configurable-criterion-triggers.patch +++ b/patches/server/0100-Configurable-criterion-triggers.patch @@ -9,10 +9,10 @@ Original code by YatopiaMC, licensed under MIT You can find the original code on https://github.com/YatopiaMC/Yatopia diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c0301008fecdae18ade4c05115a60f965f9b89cd..570e1002c30599268e6f27d0a609054ed7c3643c 100644 +index 0eddb9829788ab7c9bf72805bc46a24152c4a7a1..c0bc0dedb74a5b8a0f8afef51c28323209d9b5d5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -608,6 +608,7 @@ public class ServerPlayer extends Player { +@@ -607,6 +607,7 @@ public class ServerPlayer extends Player { @Override protected void onInsideBlock(BlockState state) { @@ -20,7 +20,7 @@ index c0301008fecdae18ade4c05115a60f965f9b89cd..570e1002c30599268e6f27d0a609054e CriteriaTriggers.ENTER_BLOCK.trigger(this, state); } -@@ -653,8 +654,7 @@ public class ServerPlayer extends Player { +@@ -652,8 +653,7 @@ public class ServerPlayer extends Player { this.setCamera(this); } } @@ -30,7 +30,7 @@ index c0301008fecdae18ade4c05115a60f965f9b89cd..570e1002c30599268e6f27d0a609054e if (this.levitationStartPos != null) { CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime); } -@@ -730,7 +730,7 @@ public class ServerPlayer extends Player { +@@ -729,7 +729,7 @@ public class ServerPlayer extends Player { this.connection.send(new ClientboundSetExperiencePacket(this.experienceProgress, this.totalExperience, this.experienceLevel)); } diff --git a/patches/server/0103-Set-item-stuck-sleep-to-15-ticks.patch b/patches/server/0101-Set-item-stuck-sleep-to-15-ticks.patch similarity index 100% rename from patches/server/0103-Set-item-stuck-sleep-to-15-ticks.patch rename to patches/server/0101-Set-item-stuck-sleep-to-15-ticks.patch diff --git a/patches/server/0104-Smarter-statistics-ticking.patch b/patches/server/0102-Smarter-statistics-ticking.patch similarity index 100% rename from patches/server/0104-Smarter-statistics-ticking.patch rename to patches/server/0102-Smarter-statistics-ticking.patch diff --git a/patches/server/0105-lithium-collections.brain-and-ai.task.memory_change_.patch b/patches/server/0103-lithium-collections.brain-and-ai.task.memory_change_.patch similarity index 100% rename from patches/server/0105-lithium-collections.brain-and-ai.task.memory_change_.patch rename to patches/server/0103-lithium-collections.brain-and-ai.task.memory_change_.patch diff --git a/patches/server/0106-lithium-ai.brain.patch b/patches/server/0104-lithium-ai.brain.patch similarity index 100% rename from patches/server/0106-lithium-ai.brain.patch rename to patches/server/0104-lithium-ai.brain.patch diff --git a/patches/server/0107-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch b/patches/server/0105-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch similarity index 99% rename from patches/server/0107-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch rename to patches/server/0105-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch index 9dd376a..431a2dc 100644 --- a/patches/server/0107-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch +++ b/patches/server/0105-lithium-ai.nearby_entity_tracking-and-ai.nearby_enti.patch @@ -600,7 +600,7 @@ index 0000000000000000000000000000000000000000..ffc44c333f0dbaf07cc2c68ac390e0a7 +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 72790d1288ff471b2270ec96a207dd65d81e514d..3009b111a25e901504e8845465574451196fc217 100644 +index 97ff4c0b6b1a12c6de82bc8d707337792d1c99b2..e43127f6325e4de9971b01fbeda03dcbc578a2f0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -147,9 +147,29 @@ import org.bukkit.event.entity.EntityPoseChangeEvent; diff --git a/patches/server/0108-some-entity-micro-opts.patch b/patches/server/0106-some-entity-micro-opts.patch similarity index 100% rename from patches/server/0108-some-entity-micro-opts.patch rename to patches/server/0106-some-entity-micro-opts.patch diff --git a/patches/server/0109-lithium-cache-iterate-outwards.patch b/patches/server/0107-lithium-cache-iterate-outwards.patch similarity index 100% rename from patches/server/0109-lithium-cache-iterate-outwards.patch rename to patches/server/0107-lithium-cache-iterate-outwards.patch diff --git a/patches/server/0110-lithium-ai.raid.patch b/patches/server/0108-lithium-ai.raid.patch similarity index 100% rename from patches/server/0110-lithium-ai.raid.patch rename to patches/server/0108-lithium-ai.raid.patch diff --git a/patches/server/0111-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0109-Dont-eat-blocks-in-non-ticking-chunks.patch similarity index 94% rename from patches/server/0111-Dont-eat-blocks-in-non-ticking-chunks.patch rename to patches/server/0109-Dont-eat-blocks-in-non-ticking-chunks.patch index 17a03b5..99885eb 100644 --- a/patches/server/0111-Dont-eat-blocks-in-non-ticking-chunks.patch +++ b/patches/server/0109-Dont-eat-blocks-in-non-ticking-chunks.patch @@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT You can find the original code on https://github.com/PurpurMC/Purpur diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index e8d9a4fc14e38d40b8a1d02752447fb98cfb4e72..f2958ec11daee53cca4e7132f076230783da7898 100644 +index ca07ba8eb33f1b4f10aba9f4b4c7c1078f80f61b..75f46b21feeb6baf911741a9b52f659c90eb7178 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1748,7 +1748,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1741,7 +1741,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange); } diff --git a/patches/server/0112-Fast-speed-check.patch b/patches/server/0110-Fast-speed-check.patch similarity index 100% rename from patches/server/0112-Fast-speed-check.patch rename to patches/server/0110-Fast-speed-check.patch diff --git a/patches/server/0113-lithium-block.moving_block_shapes.patch b/patches/server/0111-lithium-block.moving_block_shapes.patch similarity index 100% rename from patches/server/0113-lithium-block.moving_block_shapes.patch rename to patches/server/0111-lithium-block.moving_block_shapes.patch diff --git a/patches/server/0114-lithium-shapes.blockstate_cache.patch b/patches/server/0112-lithium-shapes.blockstate_cache.patch similarity index 100% rename from patches/server/0114-lithium-shapes.blockstate_cache.patch rename to patches/server/0112-lithium-shapes.blockstate_cache.patch diff --git a/patches/server/0115-lithium-gen.patch b/patches/server/0113-lithium-gen.patch similarity index 100% rename from patches/server/0115-lithium-gen.patch rename to patches/server/0113-lithium-gen.patch diff --git a/patches/server/0116-c2me-reduce_allocs.patch b/patches/server/0114-c2me-reduce_allocs.patch similarity index 100% rename from patches/server/0116-c2me-reduce_allocs.patch rename to patches/server/0114-c2me-reduce_allocs.patch