Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00
Code Issues Releases Activity

Fix CommandUtil(#348) (#349)

Browse Source 
---------

Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com>
This commit is contained in:
Lumine1909
2024-10-03 13:49:16 -04:00
committed by GitHub
parent 2e311f0e40
commit b8cd2ecd7d
7 changed files with 126 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0010-Fakeplayer-support.patch
View File

@@ -626,13 +626,12 @@ index 4632eb883e9f5efde520ee543bcad25827c0da2c..d710803137a325f34e0628405d5ddfd0
return event;
diff --git a/src/main/java/org/leavesmc/leaves/bot/BotCommand.java b/src/main/java/org/leavesmc/leaves/bot/BotCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a1054414f5313b59d38d89fb84987cad397ff12
index 0000000000000000000000000000000000000000..789ad3dd37baf80ac5597a37464cbbaceeb55d70
--- /dev/null
+++ b/src/main/java/org/leavesmc/leaves/bot/BotCommand.java
@@ -0,0 +1,543 @@
+package org.leavesmc.leaves.bot;
+
+import io.papermc.paper.command.CommandUtil;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
@@ -656,6 +655,7 @@ index 0000000000000000000000000000000000000000..5a1054414f5313b59d38d89fb84987ca
+import org.leavesmc.leaves.bot.agent.Configs;
+import org.leavesmc.leaves.bot.agent.actions.CraftCustomBotAction;
+import org.leavesmc.leaves.command.CommandArgumentResult;
+import org.leavesmc.leaves.command.LeavesCommandUtil;
+import org.leavesmc.leaves.entity.Bot;
+import org.leavesmc.leaves.event.bot.BotActionStopEvent;
+import org.leavesmc.leaves.event.bot.BotConfigModifyEvent;
@@ -762,7 +762,7 @@ index 0000000000000000000000000000000000000000..5a1054414f5313b59d38d89fb84987ca
+ }
+ }
+
+ return CommandUtil.getListMatchingLast(sender, args, list);
+ return LeavesCommandUtil.getListMatchingLast(sender, args, list, "bukkit.command.bot.", "bukkit.command.bot");
+ }
+
+ @Override
@@ -4397,6 +4397,18 @@ index 0000000000000000000000000000000000000000..a3f978318a67c3c5e147a50eb2b6c01c
+ this.value = nbt.getBoolean("spawn_phantom");
+ }
+}
diff --git a/src/main/java/org/leavesmc/leaves/command/LeavesCommandUtil.java b/src/main/java/org/leavesmc/leaves/command/LeavesCommandUtil.java
index f50c3871e3ab435abc6de5bfb67b85b09d235733..d110bf39788503ec662d6f0c737ce9aa2ab809e9 100644
--- a/src/main/java/org/leavesmc/leaves/command/LeavesCommandUtil.java
+++ b/src/main/java/org/leavesmc/leaves/command/LeavesCommandUtil.java
@@ -3,7 +3,6 @@ package org.leavesmc.leaves.command;
import com.google.common.base.Functions;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import io.papermc.paper.command.PaperCommand;
import net.minecraft.resources.ResourceLocation;
import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull;
diff --git a/src/main/java/org/leavesmc/leaves/entity/CraftBot.java b/src/main/java/org/leavesmc/leaves/entity/CraftBot.java
new file mode 100644
index 0000000000000000000000000000000000000000..46aec2f954919f487e22ab953062b6889fe3e58b