180 lines
11 KiB
Diff
180 lines
11 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bacteriawa <A3167717663@hotmail.com>
|
|
Date: Sat, 30 Aug 2025 17:07:02 +0800
|
|
Subject: [PATCH] Leaves: 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/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
|
|
index 0db0598377283e36d59be336a2fcadf46cb4d365..14fa5421107a571739f868eecb00d71dd3d29fef 100644
|
|
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
|
|
+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
|
|
@@ -36,6 +36,15 @@ class PaperEventManager {
|
|
|
|
// SimplePluginManager
|
|
public void callEvent(@NotNull Event event) {
|
|
+ // Leaves start - process bot load/save
|
|
+ if (fun.bm.lophine.config.modules.function.FakeplayerConfig.checkEnabled() && fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig.fakePlayerResident) {
|
|
+ if (event instanceof org.bukkit.event.world.WorldLoadEvent worldLoadEvent) {
|
|
+ org.leavesmc.leaves.bot.BotList.INSTANCE.loadResume(worldLoadEvent.getWorld().getUID().toString());
|
|
+ } else if (event instanceof org.bukkit.event.world.WorldUnloadEvent worldUnloadEvent) {
|
|
+ org.leavesmc.leaves.bot.BotList.INSTANCE.removeAllIn(worldUnloadEvent.getWorld().getUID().toString());
|
|
+ }
|
|
+ }
|
|
+ // Leaves end - process bot load/save
|
|
// Leaf start - Skip event if no listeners
|
|
RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
|
|
if (listeners.length == 0) return;
|
|
@@ -47,6 +56,12 @@ class PaperEventManager {
|
|
throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
|
|
}
|
|
|
|
+ // Leaves start - skip bot
|
|
+ if (event instanceof org.bukkit.event.player.PlayerEvent playerEvent && playerEvent.getPlayer() instanceof org.leavesmc.leaves.entity.bot.Bot) {
|
|
+ return;
|
|
+ }
|
|
+ // Leaves end - skip bot
|
|
+
|
|
for (RegisteredListener registration : listeners) {
|
|
if (!registration.getPlugin().isEnabled()) {
|
|
continue;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
|
index 3a47e4c633ee016d5deeb6a5ee9e2e26769d5193..efb47f914fd0c0e966c6921ed1b26c4139754c55 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
|
@@ -375,6 +375,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
|
|
@SuppressWarnings("unchecked")
|
|
public <T extends Entity> T addEntity(T entity) {
|
|
Preconditions.checkArgument(!entity.isInWorld(), "Entity has already been added to a world");
|
|
+ Preconditions.checkState(!(entity instanceof org.leavesmc.leaves.entity.bot.CraftBot), "[Leaves] Fakeplayers do not support changing world, Please use leaves fakeplayer-api instead!");
|
|
net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
|
if (nmsEntity.level() != this.getHandle().getLevel()) {
|
|
throw new IllegalArgumentException(entity + " wasn't created with this world, you must create the entity with the world you want to add it to.");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index be308fcc90df58993be31473f907dab4478290ad..7247666a8baee283f4d99a489e7a14fa9543f803 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -304,6 +304,7 @@ public final class CraftServer implements Server {
|
|
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer;
|
|
public io.papermc.paper.SparksFly spark; // Paper - spark // Luminol - Force disable builtin spark
|
|
private final ServerConfiguration serverConfig = new PaperServerConfiguration();
|
|
+ private final org.leavesmc.leaves.entity.bot.CraftBotManager botManager; // Leaves
|
|
|
|
// Paper start - Folia region threading API
|
|
private final io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaRegionScheduler(); // Folia - region threading
|
|
@@ -480,6 +481,7 @@ public final class CraftServer implements Server {
|
|
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
|
|
if (false) this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark // Luminol - Force disable builtin spark
|
|
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.init(); // Leaves - protocol
|
|
+ this.botManager = new org.leavesmc.leaves.entity.bot.CraftBotManager(); // Leaves
|
|
}
|
|
|
|
public boolean getCommandBlockOverride(String command) {
|
|
@@ -1379,7 +1381,7 @@ public final class CraftServer implements Server {
|
|
return false;
|
|
}
|
|
|
|
- if (!handle.players().isEmpty()) {
|
|
+ if (!handle.realPlayers().isEmpty()) { // Leaves - skip
|
|
return false;
|
|
}
|
|
|
|
@@ -3118,6 +3120,13 @@ public final class CraftServer implements Server {
|
|
}
|
|
// Leaves end - Feature API
|
|
|
|
+ // Leaves start - Bot API
|
|
+ @Override
|
|
+ public org.leavesmc.leaves.entity.bot.CraftBotManager getBotManager() {
|
|
+ return botManager;
|
|
+ }
|
|
+ // Leaves end - Bot API
|
|
+
|
|
// Folia start - region TPS API
|
|
/**
|
|
* Gets the TPS from the region which owns the specified location, or {@code null} if no region owns
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index f5373786032b3f1db8e6c0c928c781998b2fe194..ca6be9faab3f93da7e91bf73997111b7d737afa9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -247,7 +247,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
|
|
@Override
|
|
public int getPlayerCount() {
|
|
- return world.players().size();
|
|
+ return world.realPlayers().size(); // Leaves - skip
|
|
}
|
|
|
|
@Override
|
|
@@ -1122,9 +1122,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
|
|
@Override
|
|
public List<Player> getPlayers() {
|
|
- List<Player> list = new ArrayList<Player>(this.world.players().size());
|
|
+ List<Player> list = new ArrayList<Player>(this.world.realPlayers().size()); // Leaves - skip
|
|
|
|
- for (net.minecraft.world.entity.player.Player human : this.world.players()) {
|
|
+ for (net.minecraft.world.entity.player.Player human : this.world.realPlayers()) { // Leaves - skip
|
|
HumanEntity bukkitEntity = human.getBukkitEntity();
|
|
|
|
if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
|
|
@@ -1629,7 +1629,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
public void playSound(final net.kyori.adventure.sound.Sound sound) {
|
|
org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
|
|
final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
|
|
- for (ServerPlayer player : this.getHandle().players()) {
|
|
+ for (ServerPlayer player : this.getHandle().realPlayers()) { // Leaves - skip
|
|
player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
|
|
}
|
|
}
|
|
@@ -1657,7 +1657,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
|
|
final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
|
|
if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
|
|
- for (ServerPlayer player : this.getHandle().players()) {
|
|
+ for (ServerPlayer player : this.getHandle().realPlayers()) { // Leaves - skip
|
|
player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
|
|
}
|
|
} else if (emitter instanceof CraftEntity craftEntity) {
|
|
@@ -1780,7 +1780,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
|
|
}
|
|
this.getHandle().sendParticlesSource(
|
|
- receivers == null ? this.getHandle().players() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper - Particle API
|
|
+ receivers == null ? this.getHandle().realPlayers() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper - Particle API // Leaves - skip
|
|
sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
|
|
CraftParticle.createParticleParam(particle, data), // Particle
|
|
force,
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index 555f15b3abbd5ba2f4e6558a7c29cde109098a07..a812186b84ee188c6b2276f173bdded37791f593 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -131,6 +131,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
return new CraftHumanEntity(server, (net.minecraft.world.entity.player.Player) entity);
|
|
}
|
|
|
|
+ if (entity instanceof org.leavesmc.leaves.bot.ServerBot bot) { return new org.leavesmc.leaves.entity.bot.CraftBot(server, bot); }
|
|
+
|
|
// Special case complex part, since there is no extra entity type for them
|
|
if (entity instanceof EnderDragonPart complexPart) {
|
|
if (complexPart.parentMob instanceof EnderDragon) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 0754bd441290bacc27f3d1ae2d6cf5af94345745..04119b949c878064a0ae1028f7147de7c0e7aa16 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -1009,7 +1009,11 @@ public class CraftEventFactory {
|
|
event.setKeepInventory(keepInventory);
|
|
event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
|
|
populateFields(victim, event); // Paper - make cancellable
|
|
- Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ // Leaves start - disable bot death event
|
|
+ if (!(victim instanceof org.leavesmc.leaves.bot.ServerBot)) {
|
|
+ Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ }
|
|
+ // Leaves end - disable bot death event
|
|
// Paper start - make cancellable
|
|
if (event.isCancelled()) {
|
|
return event;
|