From ec7c0ec60dc64d7ae8e2f1ebd2a174cc89dc62b2 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:08:36 +0800 Subject: [PATCH] Fix 1.19.1 update --- .../server/0010-Add-fakeplayer-support.patch | 13 +++--- .../0011-Add-fakeplayer-action-support.patch | 40 ++++++++++--------- .../server/0013-Redstone-Shears-Wrench.patch | 11 +++-- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/patches/server/0010-Add-fakeplayer-support.patch b/patches/server/0010-Add-fakeplayer-support.patch index 472fe8e8..58c3f90b 100644 --- a/patches/server/0010-Add-fakeplayer-support.patch +++ b/patches/server/0010-Add-fakeplayer-support.patch @@ -344,17 +344,20 @@ index 0000000000000000000000000000000000000000..daaece30b2a3983f1cc9ee9a851e8f37 +} diff --git a/src/main/java/top/leavesmc/leaves/bot/ServerBot.java b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java new file mode 100644 -index 0000000000000000000000000000000000000000..24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3 +index 0000000000000000000000000000000000000000..1451e0679bd305b429b6727b7e06257a0aadc102 --- /dev/null +++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java -@@ -0,0 +1,517 @@ +@@ -0,0 +1,516 @@ +package top.leavesmc.leaves.bot; + +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.properties.Property; ++import com.mojang.datafixers.util.Pair; ++import net.minecraft.Util; +import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.GenericFutureListener; +import net.minecraft.network.Connection; ++import net.minecraft.network.PacketSendListener; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.PacketFlow; +import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket; @@ -388,10 +391,7 @@ index 0000000000000000000000000000000000000000..24d90f94da2d2ddea7e7134568b6bfcb +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin; -+import org.bukkit.entity.Player; +import org.bukkit.event.entity.CreatureSpawnEvent; -+import org.bukkit.event.player.PlayerJoinEvent; -+import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.plugin.Plugin; +import org.bukkit.util.BoundingBox; +import org.bukkit.util.Vector; @@ -399,7 +399,6 @@ index 0000000000000000000000000000000000000000..24d90f94da2d2ddea7e7134568b6bfcb +import top.leavesmc.leaves.entity.Bot; +import top.leavesmc.leaves.entity.CraftBot; +import top.leavesmc.leaves.event.bot.BotCreateEvent; -+import top.leavesmc.leaves.bot.agent.BotAction; +import top.leavesmc.leaves.event.bot.BotJoinEvent; +import top.leavesmc.leaves.util.MathUtils; + @@ -458,7 +457,7 @@ index 0000000000000000000000000000000000000000..24d90f94da2d2ddea7e7134568b6bfcb + + bot.connection = new ServerGamePacketListenerImpl(server, new Connection(PacketFlow.CLIENTBOUND) { + @Override -+ public void send(@NotNull Packet packet, @Nullable GenericFutureListener> callback) { ++ public void send(Packet packet, @Nullable PacketSendListener packetsendlistener) { + } + }, bot); + bot.isRealPlayer = true; diff --git a/patches/server/0011-Add-fakeplayer-action-support.patch b/patches/server/0011-Add-fakeplayer-action-support.patch index d181bd78..943b66a3 100644 --- a/patches/server/0011-Add-fakeplayer-action-support.patch +++ b/patches/server/0011-Add-fakeplayer-action-support.patch @@ -146,23 +146,25 @@ index 28744e9065493c7764d0b7a8c5ec0883c21d8156..30cd739eef5e6314c692272e60a5af0b + } } diff --git a/src/main/java/top/leavesmc/leaves/bot/ServerBot.java b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java -index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1c908a833 100644 +index 1451e0679bd305b429b6727b7e06257a0aadc102..8c97913bccbf80a32d1b3d76b94adf93e7dd1911 100644 --- a/src/main/java/top/leavesmc/leaves/bot/ServerBot.java +++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java -@@ -1,9 +1,12 @@ +@@ -1,11 +1,14 @@ package top.leavesmc.leaves.bot; +import com.google.common.collect.Lists; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; + import com.mojang.datafixers.util.Pair; + import net.minecraft.Util; +import com.mojang.datafixers.util.Pair; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; +import net.minecraft.Util; import net.minecraft.network.Connection; + import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; - import net.minecraft.network.protocol.PacketFlow; -@@ -12,6 +15,7 @@ import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; +@@ -15,6 +18,7 @@ import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket; import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket; import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket; import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket; @@ -170,7 +172,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.server.MinecraftServer; -@@ -22,9 +26,13 @@ import net.minecraft.server.level.TicketType; +@@ -25,9 +29,13 @@ import net.minecraft.server.level.TicketType; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerPlayerConnection; import net.minecraft.util.Mth; @@ -184,21 +186,23 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.phys.AABB; -@@ -37,11 +45,10 @@ import org.bukkit.World; +@@ -40,8 +48,10 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin; --import org.bukkit.entity.Player; import org.bukkit.event.entity.CreatureSpawnEvent; --import org.bukkit.event.player.PlayerJoinEvent; --import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; import org.bukkit.util.BoundingBox; import org.bukkit.util.Vector; -@@ -54,7 +61,10 @@ import top.leavesmc.leaves.event.bot.BotJoinEvent; +@@ -49,11 +59,15 @@ import org.jetbrains.annotations.NotNull; + import top.leavesmc.leaves.entity.Bot; + import top.leavesmc.leaves.entity.CraftBot; + import top.leavesmc.leaves.event.bot.BotCreateEvent; ++import top.leavesmc.leaves.bot.agent.BotAction; + import top.leavesmc.leaves.event.bot.BotJoinEvent; import top.leavesmc.leaves.util.MathUtils; import javax.annotation.Nullable; @@ -209,7 +213,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 import java.util.Objects; import java.util.Set; import java.util.UUID; -@@ -63,12 +73,17 @@ public class ServerBot extends ServerPlayer { +@@ -62,12 +76,17 @@ public class ServerBot extends ServerPlayer { private Vector velocity; private Vector oldVelocity; @@ -231,7 +235,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 private static final Set bots = new HashSet<>(); private static final Plugin MINECRAFT_PLUGIN = new MinecraftInternalPlugin(); -@@ -81,6 +96,8 @@ public class ServerBot extends ServerPlayer { +@@ -80,6 +99,8 @@ public class ServerBot extends ServerPlayer { this.oldVelocity = velocity.clone(); this.noFallTicks = 60; this.fireTicks = 0; @@ -240,7 +244,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 this.removeOnDeath = true; } -@@ -186,12 +203,17 @@ public class ServerBot extends ServerPlayer { +@@ -185,12 +206,17 @@ public class ServerBot extends ServerPlayer { } } @@ -258,7 +262,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 // die check end @Nullable -@@ -205,10 +227,6 @@ public class ServerBot extends ServerPlayer { +@@ -204,10 +230,6 @@ public class ServerBot extends ServerPlayer { return groundTicks != 0; } @@ -269,7 +273,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 public static boolean solidAt(Location loc) { Block block = loc.getBlock(); BoundingBox box = block.getBoundingBox(); -@@ -303,12 +321,24 @@ public class ServerBot extends ServerPlayer { +@@ -302,12 +324,24 @@ public class ServerBot extends ServerPlayer { public void tick() { // loadChunks(); // Load chunks super.tick(); @@ -298,7 +302,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 if (checkGround()) { if (groundTicks < 5) groundTicks++; -@@ -336,7 +366,88 @@ public class ServerBot extends ServerPlayer { +@@ -335,7 +369,88 @@ public class ServerBot extends ServerPlayer { checkOutOfWorld(); @@ -387,7 +391,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 } @Override -@@ -369,21 +480,6 @@ public class ServerBot extends ServerPlayer { +@@ -368,21 +483,6 @@ public class ServerBot extends ServerPlayer { } } @@ -409,7 +413,7 @@ index 24d90f94da2d2ddea7e7134568b6bfcbe8c53ec3..b945cedb0c35418180415112dbccbca1 public Location getLocation() { return getBukkitPlayer().getLocation(); } -@@ -475,6 +571,68 @@ public class ServerBot extends ServerPlayer { +@@ -474,6 +574,68 @@ public class ServerBot extends ServerPlayer { this.move(MoverType.SELF, new Vec3(velocity.getX(), y, velocity.getZ())); } diff --git a/patches/server/0013-Redstone-Shears-Wrench.patch b/patches/server/0013-Redstone-Shears-Wrench.patch index 99974ac0..1a9e1d95 100644 --- a/patches/server/0013-Redstone-Shears-Wrench.patch +++ b/patches/server/0013-Redstone-Shears-Wrench.patch @@ -5,21 +5,20 @@ Subject: [PATCH] Redstone Shears Wrench diff --git a/src/main/java/net/minecraft/world/item/ShearsItem.java b/src/main/java/net/minecraft/world/item/ShearsItem.java -index e77af779c77de6d5580c13699df3e7d890fe7aba..8d2467e5faf74c83462ca6e1f8cd6b507a0ddb06 100644 +index e77af779c77de6d5580c13699df3e7d890fe7aba..c9310e88b3a967cb9cacb80288e74757fffca647 100644 --- a/src/main/java/net/minecraft/world/item/ShearsItem.java +++ b/src/main/java/net/minecraft/world/item/ShearsItem.java -@@ -1,7 +1,10 @@ +@@ -1,7 +1,9 @@ package net.minecraft.world.item; +import net.minecraft.Util; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; -+import net.minecraft.network.chat.ChatType; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -@@ -14,8 +17,18 @@ import net.minecraft.world.item.context.UseOnContext; +@@ -14,8 +16,18 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -38,7 +37,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8d2467e5faf74c83462ca6e1f8cd6b50 public class ShearsItem extends Item { public ShearsItem(Item.Properties settings) { -@@ -77,6 +90,59 @@ public class ShearsItem extends Item { +@@ -77,6 +89,59 @@ public class ShearsItem extends Item { } } @@ -90,7 +89,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8d2467e5faf74c83462ca6e1f8cd6b50 + } + + private static void message(Player player, Component message) { -+ ((ServerPlayer) player).sendSystemMessage(message, ChatType.GAME_INFO); ++ ((ServerPlayer) player).sendSystemMessage(message, true); + } + + private static > String getNameHelper(BlockState state, Property property) {