Repo-Mirror/LuminolMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not check tickThread while removing bots

Browse Source
This commit is contained in:
MrHua269
2024-02-02 01:19:16 +00:00
parent a780b90545
commit 00fb6f9ab7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0056-Leaves-fakeplayer-support.patch
View File

@@ -1270,10 +1270,10 @@ 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 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 new file mode 100644
index 0000000000000000000000000000000000000000..2cd6877c59659edc1ada5ad0a5d13ec2f106e41b index 0000000000000000000000000000000000000000..daef37d0b1185657ce89a3ed5f2a76c1e135ce93
--- /dev/null --- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java +++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
@@ -0,0 +1,781 @@ @@ -0,0 +1,782 @@
+package top.leavesmc.leaves.bot; +package top.leavesmc.leaves.bot;
+ +
+import com.google.common.collect.Lists; +import com.google.common.collect.Lists;
@@ -1951,10 +1951,11 @@ index 0000000000000000000000000000000000000000..2cd6877c59659edc1ada5ad0a5d13ec2
+ CompletableFuture.allOf( + CompletableFuture.allOf(
+ bots.stream() + bots.stream()
+ .map(bot ->{ + .map(bot ->{
+ if (TickThread.isTickThreadFor(bot)){ + //Do not check if it is on region thread,return to the target region anyway
+ /*if (TickThread.isTickThreadFor(bot)){
+ bot.die(bot.damageSources().fellOutOfWorld()); + bot.die(bot.damageSources().fellOutOfWorld());
+ return CompletableFuture.completedFuture(null); + return CompletableFuture.completedFuture(null);
+ } + }*/
+ +
+ return CompletableFuture.runAsync(()->{ + return CompletableFuture.runAsync(()->{
+ bot.die(bot.damageSources().fellOutOfWorld()); + bot.die(bot.damageSources().fellOutOfWorld());