From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa Date: Sat, 30 Aug 2025 17:16:32 +0800 Subject: [PATCH] Leaves: Fakeplayer Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java b/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java index dfce5ced082de0caaff8da071fb632cd6ae787c9..d5c1862ebf6066859da74f47fa0be0256ba0f653 100644 --- a/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java +++ b/net/minecraft/advancements/criterion/SimpleCriterionTrigger.java @@ -41,6 +41,7 @@ public abstract class SimpleCriterionTrigger matcher) { + if (player instanceof org.leavesmc.leaves.bot.ServerBot) return; // Leaves - bot skip PlayerAdvancements advancements = player.getAdvancements(); Set> allListeners = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak if (allListeners != null && !allListeners.isEmpty()) { diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java index efbbc1a40d203a2818eeda2a4e938b9a6117f1c3..6b85a5ad9af0c57a0d4d5b55f62b82c5ff69b0e8 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java @@ -74,7 +74,7 @@ public class Connection extends SimpleChannelInboundHandler> { public boolean preparing = true; // Spigot end private volatile @Nullable PacketListener disconnectListener; - private volatile @Nullable PacketListener packetListener; + protected volatile @Nullable PacketListener packetListener; // Leaves - private -> protected private @Nullable DisconnectionDetails disconnectionDetails; private boolean encrypted; private final java.util.concurrent.atomic.AtomicBoolean disconnectionHandled = new java.util.concurrent.atomic.AtomicBoolean(false); // Folia - region threading - may be called concurrently during configuration stage diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java index 54ba8a2bc70f3a7f9754a872f6b9c22b40887d8e..c4685bb540e95d889dfbc107923876045be29848 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -297,6 +297,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(final Function factory) { ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system AtomicReference serverReference = new AtomicReference<>(); @@ -1226,6 +1228,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { // Folia - region threading - this is complicated to implement, and even if done correctly is messy - if (this.playerList.getPlayerCount() == 0 && !this.tickRateManager.isSprinting() && this.pluginsBlockingSleep.isEmpty()) { // Paper - API to allow/disallow tick sleeping + if (this.playerList.getPlayerCount() == 0 && this.botList.bots.isEmpty() && !this.tickRateManager.isSprinting() && this.pluginsBlockingSleep.isEmpty()) { // Paper - API to allow/disallow tick sleeping // Leaves - fakeplayer this.emptyTicks++; } else { this.emptyTicks = 0; @@ -1827,6 +1839,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { this.playerList.saveAll(playerSaveInterval); + org.leavesmc.leaves.bot.BotList.INSTANCE.saveAllResumeBots(playerSaveInterval); // Leaves - resident fakeplayer } if (region == null && fullSave) { // Folia - region threading - don't auto save level data this.saveGlobalData(false); @@ -2065,6 +2078,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop players, final @Nullable Component reason) throws CommandSyntaxException { UserBanList list = source.getServer().getPlayerList().getBans(); int count = 0; - + boolean hasBot = false; // Leaves - disable kick for (NameAndId player : players) { + // Leaves start - disable ban + if (player.isBot()) { + source.sendFailure(Component.literal("Permission denied")); + hasBot = true; + continue; + } + // Leaves end - disable ban if (!list.isBanned(player)) { UserBanListEntry entry = new UserBanListEntry(player, null, source.getTextName(), null, reason == null ? null : reason.getString()); list.add(entry); @@ -53,7 +60,13 @@ public class BanPlayerCommands { } if (count == 0) { - throw ERROR_ALREADY_BANNED.create(); + // Leaves start - disable kick + if (hasBot) { + return count; + } else { + throw ERROR_ALREADY_BANNED.create(); + } + // Leaves end - disable kick } else { return count; } diff --git a/net/minecraft/server/commands/KickCommand.java b/net/minecraft/server/commands/KickCommand.java index 0227dd63f67537d769494e122616873c18d35350..18d49018b1330cfcaa91d9b02d0d23e4ba941809 100644 --- a/net/minecraft/server/commands/KickCommand.java +++ b/net/minecraft/server/commands/KickCommand.java @@ -38,9 +38,17 @@ public class KickCommand { if (!source.getServer().isPublished()) { throw ERROR_SINGLEPLAYER.create(); } else { + boolean hasBot = false; // Leaves - disable kick int count = 0; for (ServerPlayer player : players) { + // Leaves start - disable kick + if (player instanceof org.leavesmc.leaves.bot.ServerBot) { + source.sendFailure(Component.literal("Permission denied")); + hasBot = true; + continue; + } + // Leaves end - disable kick if (!source.getServer().isSingleplayerOwner(player.nameAndId())) { player.connection.disconnect(reason, org.bukkit.event.player.PlayerKickEvent.Cause.KICK_COMMAND); // Paper - kick event cause source.sendSuccess(() -> Component.translatable("commands.kick.success", player.getDisplayName(), reason), true); @@ -49,7 +57,13 @@ public class KickCommand { } if (count == 0) { - throw ERROR_KICKING_OWNER.create(); + // Leaves start - disable kick + if (hasBot) { + return count; + } else { + throw ERROR_KICKING_OWNER.create(); + } + // Leaves end - disable kick } else { return count; } diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java index 636f56bfc0e9075b257e2eb14e858975bdedd801..20cbc0e65fea3fc2d0033259c2f35e158ea81926 100644 --- a/net/minecraft/server/commands/OpCommand.java +++ b/net/minecraft/server/commands/OpCommand.java @@ -39,6 +39,7 @@ public class OpCommand { int count = 0; for (NameAndId player : players) { + if (player.isBot()) continue; // Leaves - disable op if (!list.isOp(player)) { list.op(player); count++; diff --git a/net/minecraft/server/commands/StopCommand.java b/net/minecraft/server/commands/StopCommand.java index e9c9a468f046832e8eaa999bb57da261b4633604..2efe24c0378a80dd2750b10a54c1887816236c1a 100644 --- a/net/minecraft/server/commands/StopCommand.java +++ b/net/minecraft/server/commands/StopCommand.java @@ -11,6 +11,10 @@ public class StopCommand { c.getSource().sendSuccess(() -> Component.translatable("commands.stop.stopping"), true); c.getSource().getServer().halt(false); return 1; - })); + }).then(Commands.literal("force").requires(Commands.hasPermission(Commands.LEVEL_OWNERS)).executes(c -> { + c.getSource().sendSuccess(() -> Component.translatable("commands.stop.stopping"), true); + c.getSource().getServer().safeShutdown(false, false, true); + return 1; + }))); } } diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java index 1bc1e9a77dca7acfe5f989f6439f185d0d2e20a6..1790e8c141a8d3f7ccf4b11f9a28b3582325e317 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -274,6 +274,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface } // Spigot start + this.setBotList(new org.leavesmc.leaves.bot.BotList(this)); // Leaves - fakeplayer this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings")); org.spigotmc.SpigotConfig.registerCommands(); @@ -295,6 +296,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface consoleThread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command if (false) this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark // Luminol - Force disable builtin spark + this.getBotList().loadResumeBotInfo(); // Leaves - load resident bot info com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java index 0dfb25ad032429a2aea7aa441dd5fd1848a6c617..215f2a40921cc8e6b181c0a34aa1bbaf843e3059 100644 --- a/net/minecraft/server/level/ChunkMap.java +++ b/net/minecraft/server/level/ChunkMap.java @@ -1388,6 +1388,13 @@ public class ChunkMap extends SimpleRegionStorage implements ChunkHolder.PlayerP } } else { this.removePlayer(player); + // Leaves start - render bot + if (this.entity instanceof org.leavesmc.leaves.bot.ServerBot bot) { + if (bot.needSendFakeData(player)) { + bot.sendFakeData(player.connection, false); + } + } + // Leaves end - render bot } } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java index 0befa4fc81e10a23c6ba824e559f2fb4886e68ee..2ddcf6ae90aaaf98e2fcd8ab9995b6f0d7791856 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -240,6 +240,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet //public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent // Folia - region threading - move to regionised world data //public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent // Folia - region threading - move to regionised world data //private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current) // Folia - region threading - move to regionised world data + final List realPlayers; // Leaves - skip @Override public @Nullable LevelChunk getChunkIfLoaded(int x, int z) { @@ -706,6 +707,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler); // Paper end - rewrite chunk system this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit + this.realPlayers = Lists.newArrayList(); // Leaves - skip this.updateTickData(); // Folia - region threading - make sure it is initialised before ticked } @@ -2611,6 +2613,12 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet return this.players; } + // Leaves start - fakeplayer skip + public List realPlayers() { + return this.realPlayers; + } + // Leaves end - fakeplayer skip + @Override public void updatePOIOnBlockStateChange(final BlockPos pos, final BlockState oldState, final BlockState newState) { Optional> oldType = PoiTypes.forState(oldState); @@ -3091,6 +3099,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true if (entity instanceof ServerPlayer player) { ServerLevel.this.players.add(player); + // Leaves start - skip + if (!(player instanceof org.leavesmc.leaves.bot.ServerBot)) { + ServerLevel.this.realPlayers.add(player); + } + // Leaves end - skip if (player.isReceivingWaypoints()) { ServerLevel.this.getWaypointManager().addPlayer(player); } @@ -3172,6 +3185,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet ServerLevel.this.getChunkSource().removeEntity(entity); if (entity instanceof ServerPlayer player) { ServerLevel.this.players.remove(player); + // Leaves start - skip + if (!(player instanceof org.leavesmc.leaves.bot.ServerBot)) { + ServerLevel.this.realPlayers.remove(player); + } + // Leaves end - skip ServerLevel.this.getWaypointManager().removePlayer(player); ServerLevel.this.updateSleepingPlayerList(); } diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java index baab2435bac22aacff30ad52bde629b4093bfaba..cdb4a52cbd34322903144364c3686a4e1bf0fbb8 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -229,7 +229,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc private static final boolean DEFAULT_SPAWN_EXTRA_PARTICLES_ON_FALL = false; public ServerGamePacketListenerImpl connection; private final MinecraftServer server; - public final ServerPlayerGameMode gameMode; + public ServerPlayerGameMode gameMode; // Leaves - not final private final PlayerAdvancements advancements; private final ServerStatsCounter stats; private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE; @@ -250,7 +250,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc private @Nullable Entity camera; public boolean isChangingDimension; public boolean seenCredits = false; - private final ServerRecipeBook recipeBook; + protected ServerRecipeBook recipeBook; // Leaves - not final and private -> protected private @Nullable Vec3 levitationStartPos; private int levitationStartTime; private boolean disconnected; @@ -1514,7 +1514,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } // Luminol End - Cross Region Damage trace - private void tellNeutralMobsThatIDied() { + protected void tellNeutralMobsThatIDied() { // Leaves private -> protected AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0); this.level() .getEntitiesOfClass(Mob.class, aabb, EntitySelector.NO_SPECTATORS) @@ -2180,6 +2180,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.lastSentHealth = -1.0F; this.lastSentFood = -1; this.teleportSpectators(transition, oldLevel); + // Leaves start - bot support + if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) { + this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(this, true)); // Leaves - render bot + } + // Leaves end - bot support // CraftBukkit start org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), oldLevel.getWorld()); this.level().getCraftServer().getPluginManager().callEvent(changeEvent); diff --git a/net/minecraft/server/players/CachedUserNameToIdResolver.java b/net/minecraft/server/players/CachedUserNameToIdResolver.java index 50c64f4be138f08e8a57fb10888dbfbc364c91af..382fc20df48d7d554833715a9c9f62ea7464a25d 100644 --- a/net/minecraft/server/players/CachedUserNameToIdResolver.java +++ b/net/minecraft/server/players/CachedUserNameToIdResolver.java @@ -122,6 +122,12 @@ public class CachedUserNameToIdResolver implements UserNameToIdResolver { @Override public Optional get(final String name) { + // Leaves start - fix bot + org.leavesmc.leaves.bot.ServerBot bot = org.leavesmc.leaves.bot.BotList.INSTANCE.getBotByName(name); + if (bot != null) { + return Optional.of(bot.nameAndId()); + } + // Leaves end - fix bot String userName = name.toLowerCase(Locale.ROOT); boolean stateLocked = true; try { this.stateLock.lock(); // Paper - Fix GameProfileCache concurrency CachedUserNameToIdResolver.GameProfileInfo profileInfo = this.profilesByName.get(userName); diff --git a/net/minecraft/server/players/NameAndId.java b/net/minecraft/server/players/NameAndId.java index 484714beb5f7cdf8178834c5edd4f847fb06ebb8..ba7a280aad07f36366c15cd158b36ca9768cef19 100644 --- a/net/minecraft/server/players/NameAndId.java +++ b/net/minecraft/server/players/NameAndId.java @@ -8,18 +8,22 @@ import java.util.UUID; import net.minecraft.core.UUIDUtil; import org.jspecify.annotations.Nullable; -public record NameAndId(UUID id, String name) { +public record NameAndId(UUID id, String name, boolean isBot) { // Leaves - fakeplayer public static final Codec CODEC = RecordCodecBuilder.create( i -> i.group(UUIDUtil.STRING_CODEC.fieldOf("id").forGetter(NameAndId::id), Codec.STRING.fieldOf("name").forGetter(NameAndId::name)) .apply(i, NameAndId::new) ); public NameAndId(final GameProfile profile) { - this(profile.id(), profile.name()); + this(profile.id(), profile.name(), com.google.common.collect.Iterables.getFirst(profile.properties().get("is_bot"), "false").equals("true")); // Leaves - fakeplayer } public NameAndId(final com.mojang.authlib.yggdrasil.response.NameAndId profile) { - this(profile.id(), profile.name()); + this(profile.id(), profile.name(), false); // Leaves - fakeplayer + } + + public NameAndId(UUID uuid, String name) { + this(uuid, name, false); // Leaves - fakeplayer } public static @Nullable NameAndId fromJson(final JsonObject object) { @@ -33,7 +37,7 @@ public record NameAndId(UUID id, String name) { return null; } - return new NameAndId(uuid, object.get("name").getAsString()); + return new NameAndId(uuid, object.get("name").getAsString(), false); // Leaves - fakeplayer } else { return null; } @@ -46,7 +50,7 @@ public record NameAndId(UUID id, String name) { public static NameAndId createOffline(final String name) { UUID id = UUIDUtil.createOfflinePlayerUUID(name); - return new NameAndId(id, name); + return new NameAndId(id, name, false); // Leaves - fakeplayer } // Paper start - utility method for common conversion back to the game profile diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java index ebd2f2887780d9c6c3c44983bac23eab732cf43f..14be3d21cc1a613b1d9164ecc699073f0da2047c 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -319,6 +319,19 @@ public abstract class PlayerList { org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player); // Leaves - protocol + // Leaves start - bot support + if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) { + org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName()); + if (bot != null) { + this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, false); + } + this.server.getBotList().bots.forEach(bot1 -> { + bot1.sendPlayerInfo(player); + bot1.sendFakeDataIfNeed(player, true); + }); // Leaves - render bot + } + // Leaves end - bot support + final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure @@ -791,6 +804,11 @@ public abstract class PlayerList { respawnReason ).callEvent(); // Paper end + // Leaves start - bot support + if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) { + this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(player, true)); // Leaves - render bot + } + // Leaves end - bot support return player; } @@ -893,11 +911,16 @@ public abstract class PlayerList { public String[] getPlayerNamesArray() { List players = new java.util.ArrayList<>(this.players); // Folia - region threading - String[] names = new String[players.size()]; // Folia - region threading + String[] names = new String[players.size() + this.server.getBotList().bots.size()]; // Leaves - fakeplayer support for (int i = 0; i < players.size(); i++) { // Folia - region threading names[i] = players.get(i).getGameProfile().name(); // Folia - region threading } + // Leaves start - fakeplayer support + for (int i = this.players.size(); i < names.length; ++i) { + names[i] = this.server.getBotList().bots.get(i - this.players.size()).gameProfile.name(); + } + // Leaves end - fakeplayer support return names; } @@ -1016,8 +1039,15 @@ public abstract class PlayerList { || this.allowCommandsForAllPlayers; } - public @Nullable ServerPlayer getPlayerByName(final String name) { - return this.playersByName.get(name.toLowerCase(java.util.Locale.ROOT)); // Spigot + public @Nullable ServerPlayer getPlayerByName(String name) { + // Leaves start - fakeplayer support + name = name.toLowerCase(java.util.Locale.ROOT); + ServerPlayer player = this.playersByName.get(name); + if (player == null) { + player = this.server.getBotList().getBotByName(name); + } + return player; // Spigot + // Leaves end - fakeplayer support } public void broadcast( @@ -1360,7 +1390,13 @@ public abstract class PlayerList { } public @Nullable ServerPlayer getPlayer(final UUID uuid) { - return this.playersByUUID.get(uuid); + // Leaves start - fakeplayer support + ServerPlayer player = this.playersByUUID.get(uuid); + if (player == null) { + player = this.server.getBotList().getBot(uuid); + } + return player; + // Leaves start - fakeplayer support } public @Nullable ServerPlayer getPlayer(final String playerName) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java index f090b8d77bd2731debfc61c263bd77550f52212b..03c155140da7300f6f934aff323e0daed1b63366 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1257,7 +1257,7 @@ public abstract class Entity BlockPos effectPos = this.getOnPosLegacy(); BlockState effectState = this.level().getBlockState(effectPos); - if (this.isLocalInstanceAuthoritative()) { + if (this.isLocalInstanceAuthoritative() || this instanceof org.leavesmc.leaves.bot.ServerBot) { // Leaves - ServerBot needs check fall damage this.checkFallDamage(movement.y, this.onGround(), effectState, effectPos); } @@ -1602,7 +1602,7 @@ public abstract class Entity return colliders.isEmpty() ? maxDistance : -Shapes.collide(Direction.Axis.Y, aabb, colliders, -maxDistance); } - private Vec3 collide(final Vec3 movement) { + public Vec3 collide(final Vec3 movement) { // Leaves - private -> public // Paper start - optimise collisions final boolean xZero = movement.x == 0.0; final boolean yZero = movement.y == 0.0; diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java index 2bce20202b7c539bee3685741663a8ed225919ff..a2f44e4354f6aa1c0502cba40cadaad59193b169 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -3347,7 +3347,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin private void travelRidden(final Player controller, final Vec3 selfInput) { Vec3 riddenInput = this.getRiddenInput(controller, selfInput); this.tickRidden(controller, riddenInput); - if (this.canSimulateMovement()) { + if (this.canSimulateMovement() || this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot) { // Leaves - Fakeplayer this.setSpeed(this.getRiddenSpeed(controller)); this.travel(riddenInput); } else { @@ -4270,7 +4270,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin // Paper start - lag compensate eating // we add 1 to the expected time to avoid lag compensating when we should not final boolean shouldLagCompensate = this.useItem.has(DataComponents.FOOD) && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1L + this.totalEatTimeTicks) * 50L * (1000L * 1000L)); - if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level().isClientSide() && !useItem.useOnRelease()) { + if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !(this instanceof org.leavesmc.leaves.bot.ServerBot) && !this.level().isClientSide() && !useItem.useOnRelease()) { this.useItemRemaining = 0; // Paper end - lag compensate eating this.completeUsingItem(); @@ -4459,6 +4459,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.stopUsingItem(); } + // Leaves start - Fakeplayer + public boolean releaseUsingItemWithResult() { + ItemStack itemInHand = this.getItemInHand(this.getUsedItemHand()); + boolean result = false; + if (!this.useItem.isEmpty() && ItemStack.isSameItem(itemInHand, this.useItem)) { + this.useItem = itemInHand; + result = this.useItem.releaseUsingWithResult(this.level(), this, this.getUseItemRemainingTicks()); + if (this.useItem.useOnRelease()) { + this.updatingUsingItem(); + } + } + + this.stopUsingItem(); + return result; + } + // Leaves end - Fakeplayer + public void stopUsingItem() { if (!this.level().isClientSide()) { boolean wasUsingItem = this.isUsingItem(); diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java index b45481f781f3556001af89704b718d6291ba1f66..2135ea645131c27b9bec5534431199f9d55134d8 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -167,7 +167,7 @@ public abstract class Player extends Avatar implements ContainerUser { private int lastLevelUpTime; public GameProfile gameProfile; private boolean reducedDebugInfo; - private ItemStack lastItemInMainHand = ItemStack.EMPTY; + protected ItemStack lastItemInMainHand = ItemStack.EMPTY; // Leaves - fakeplayer private final ItemCooldowns cooldowns = this.createItemCooldowns(); private Optional lastDeathLocation = Optional.empty(); public @Nullable FishingHook fishing; @@ -340,6 +340,12 @@ public abstract class Player extends Avatar implements ContainerUser { this.updatePlayerPose(); } + // Leaves start - fakeplayer + protected void livingEntityTick() { + super.tick(); + } + // Leaves end - fakeplayer + @Override protected float getMaxHeadRotationRelativeToBody() { return this.isBlocking() ? 15.0F : super.getMaxHeadRotationRelativeToBody(); @@ -565,7 +571,7 @@ public abstract class Player extends Avatar implements ContainerUser { public void removeEntitiesOnShoulder() { } - private void touch(final Entity entity) { + public void touch(final Entity entity) { // Leaves - private -> public entity.playerTouch(this); } @@ -1247,7 +1253,7 @@ public abstract class Player extends Avatar implements ContainerUser { // Paper end - Configurable sprint interruption on attack } - if (entity instanceof ServerPlayer && entity.hurtMarked) { + if ((entity instanceof ServerPlayer && !(entity instanceof org.leavesmc.leaves.bot.ServerBot)) && entity.hurtMarked) { // Leaves - bot knockback // CraftBukkit start - Add Velocity Event boolean cancelled = false; org.bukkit.entity.Player player = (org.bukkit.entity.Player) entity.getBukkitEntity(); diff --git a/net/minecraft/world/entity/projectile/FishingHook.java b/net/minecraft/world/entity/projectile/FishingHook.java index 0c8a48988c859669cf7e38816aaf32782c245244..a554e050d0c582c441af9d5616367234caa67ab0 100644 --- a/net/minecraft/world/entity/projectile/FishingHook.java +++ b/net/minecraft/world/entity/projectile/FishingHook.java @@ -58,7 +58,7 @@ public class FishingHook extends Projectile { public static final EntityDataAccessor DATA_HOOKED_ENTITY = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.INT); private static final EntityDataAccessor DATA_BITING = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.BOOLEAN); private int life; - private int nibble; + public int nibble; // Leaves - private -> public public int timeUntilLured; public int timeUntilHooked; public float fishAngle; diff --git a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java index 05176458264b110ef3280342866ace22ec5a3333..2ce33513fd8e3de912c69ca8bc558a5800784ac5 100644 --- a/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java +++ b/net/minecraft/world/entity/vehicle/boat/AbstractBoat.java @@ -270,6 +270,11 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable { } this.move(MoverType.SELF, this.getDeltaMovement()); + } else if (this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot) { // Leaves start - Fakeplayer + this.floatBoat(); + this.controlBoat(); + this.move(MoverType.SELF, this.getDeltaMovement()); + // Leaves end - Fakeplayer } else { this.setDeltaMovement(Vec3.ZERO); } @@ -380,6 +385,13 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable { } } + // Leaves start - Fakeplayer + @Override + public boolean canSimulateMovement() { + return super.canSimulateMovement() || this.getControllingPassenger() instanceof org.leavesmc.leaves.bot.ServerBot; + } + // Leaves end - Fakeplayer + protected @Nullable SoundEvent getPaddleSound() { return switch (this.getStatus()) { case IN_WATER, UNDER_WATER, UNDER_FLOWING_WATER -> SoundEvents.BOAT_PADDLE_WATER; diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java index fa1f7dd22959632aaa54e72c8caf13ea072e7ca7..ae6056c3b6ae3eebdfb59cf54d7333dfc2cebf6a 100644 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -407,6 +407,7 @@ public abstract class AbstractContainerMenu { private void doClick(final int slotIndex, final int buttonNum, final ContainerInput containerInput, final Player player) { Inventory inventory = player.getInventory(); + if (!doClickCheck(slotIndex, buttonNum, containerInput, player)) return; // Leaves - doClick check if (containerInput == ContainerInput.QUICK_CRAFT) { int expectedStatus = this.quickcraftStatus; this.quickcraftStatus = getQuickcraftHeader(buttonNum); @@ -681,6 +682,22 @@ public abstract class AbstractContainerMenu { } } + // Leaves start - doClick check + private boolean doClickCheck(int slotIndex, int buttonNum, ContainerInput containerInput, Player player) { + if (slotIndex < 0) { + return true; + } + + Slot slot = getSlot(slotIndex); + ItemStack itemStack = slot.getItem(); + net.minecraft.world.item.component.CustomData customData = itemStack.get(net.minecraft.core.component.DataComponents.CUSTOM_DATA); + if (customData != null && customData.contains("Leaves.Gui.Placeholder")) { + return !customData.copyTag().getBoolean("Leaves.Gui.Placeholder").orElse(false); + } + return true; + } + // Leaves end - doClick check + private boolean tryItemClickBehaviourOverride( final Player player, final ClickAction clickAction, final Slot slot, final ItemStack clicked, final ItemStack carried ) { diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java index b052bc0107d93cd65a6c92914d6b3d02d6cc5ccb..fd2545f33692f964b62415178069e46e9c9d4c02 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -453,7 +453,7 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(level, player, hand, blocks.getFirst(), pos); } - if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) { + if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild()) && (!(player instanceof org.leavesmc.leaves.bot.ServerBot))) { // Leaves - Fakeplayer skip this check result = InteractionResult.FAIL; // cancel placement // PAIL: Remove this when MC-99075 fixed player.containerMenu.forceHeldSlot(hand); @@ -982,6 +982,20 @@ public final class ItemStack implements DataComponentHolder, ItemInstance, Chang } } + // Leaves start - Fakeplayer + public boolean releaseUsingWithResult(Level level, LivingEntity livingEntity, int timeLeft) { + ItemStack itemStack = this.copy(); + if (this.getItem().releaseUsing(this, level, livingEntity, timeLeft)) { + ItemStack itemStack1 = this.applyAfterUseComponentSideEffects(livingEntity, itemStack); + if (itemStack1 != this) { + livingEntity.setItemInHand(livingEntity.getUsedItemHand(), itemStack1); + } + return true; + } + return false; + } + // Leaves end - Fakeplayer + public boolean useOnRelease() { return this.getItem().useOnRelease(this); } diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java index 282849162b88354893a15533e66d046fdd035bd6..2ecb10fe97d15954e44c61247eabc8818eb16f34 100644 --- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java @@ -152,7 +152,7 @@ public class PistonMovingBlockEntity extends BlockEntity { break; } - if (!(entity instanceof ServerPlayer)) { + if (!(entity instanceof ServerPlayer) || (entity instanceof org.leavesmc.leaves.bot.ServerBot)) { // Leaves - bot slime block Vec3 deltaMovement = entity.getDeltaMovement(); double dx = deltaMovement.x; double dy = deltaMovement.y; diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java index 9d7238a28440ddc442c9288a617795261df767d9..142ab133d3b68eb9b88651e307653f1aafdf1de3 100644 --- a/net/minecraft/world/level/levelgen/PhantomSpawner.java +++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java @@ -49,6 +49,10 @@ public class PhantomSpawner implements CustomSpawner { ServerStatsCounter stats = player.getStats(); int value = Mth.clamp(stats.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE); int dayLength = 24000; + if (player instanceof org.leavesmc.leaves.bot.ServerBot bot && bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.SPAWN_PHANTOM)) { + dayLength = Math.max(bot.notSleepTicks, 1); + } + // Leaves end - fakeplayer spawn if (random.nextInt(value) >= level.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms BlockPos spawnPos = playerPos.above(20 + random.nextInt(15)) .east(-10 + random.nextInt(21))