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

Add Fakeplayer Unable Name List

Browse Source
This commit is contained in:
violetc
2022-04-16 18:07:07 +08:00
parent 25085e29c7
commit b2e9680176
5 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
patches/server/0010-Add-fakeplayer-support.patch
View File

@@ -29,7 +29,7 @@ index b16287a47870978706734b928b87f2357e91e3a1..407c71621769f91955f0b3d2d87b4014
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..d93311c3a60e54378b97286bbe7dc73ee6d5f119 100644
index 188c68d4ae46bc05c6d9c901b5c6ab883fa05ea4..ec4616f6c7c4869e526dd214f0ed13c85f145e9e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -92,6 +92,7 @@ import net.minecraft.world.scores.Objective;
@@ -59,10 +59,10 @@ index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..d93311c3a60e54378b97286bbe7dc73e
if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index a85a5de7d85cf6c5e19c0245c40e6106e6623007..1931114944847708ba9e82ce3b82675f1d477446 100644
index a85a5de7d85cf6c5e19c0245c40e6106e6623007..898c61c25675232e203ee2c872ca25804c41358c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -7,11 +7,13 @@ import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -70,7 +70,13 @@ index a85a5de7d85cf6c5e19c0245c40e6106e6623007..1931114944847708ba9e82ce3b82675f
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -63,6 +64,10 @@ public final class LeavesConfig {
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,6 +65,10 @@ public final class LeavesConfig {
LeavesConfig.load(config);
commands = new HashMap<>();
@@ -81,13 +87,35 @@ index a85a5de7d85cf6c5e19c0245c40e6106e6623007..1931114944847708ba9e82ce3b82675f
}
public static void load(final YamlConfiguration config) {
@@ -134,6 +139,11 @@ public final class LeavesConfig {
@@ -124,6 +130,12 @@ public final class LeavesConfig {
return LeavesConfig.config.getString(path, dfl);
}
+
+ static <T> List<T> getList(final String path, final List<T> def) {
+ LeavesConfig.config.addDefault(path, def);
+ return (List<T>) LeavesConfig.config.getList(path, config.getList(path));
+ }
+
public static boolean playerCanEditSign = true;
private static void playerCanEditSign() {
playerCanEditSign = getBoolean("settings.player-can-edit-sign", playerCanEditSign);
@@ -134,6 +146,20 @@ public final class LeavesConfig {
snowballAndEggCanKnockback = getBoolean("settings.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
}
+ public static boolean fakeplayerSupport = true;
+ private static void fakeplayerSupport() {
+ fakeplayerSupport = getBoolean("settings.fakeplayer-support", fakeplayerSupport);
+ if (config.contains("settings.fakeplayer-support")) {
+ fakeplayerSupport = LeavesConfig.config.getBoolean("settings.fakeplayer-support", fakeplayerSupport);
+ LeavesConfig.config.set("settings.fakeplayer-support", null);
+ }
+ fakeplayerSupport = getBoolean("settings.fakeplayer.enable", fakeplayerSupport);
+ }
+
+ public static List<String> unableFakeplayerNames;
+ private static void unableFakeplayerNames() {
+ unableFakeplayerNames = getList("settings.fakeplayer.unable-fakeplayer-names", Arrays.asList("player-name"));
+ }
+
public static final class WorldConfig {
@@ -574,10 +602,10 @@ index 0000000000000000000000000000000000000000..ebea5607956b1328f928d905e4f35424
+}
diff --git a/src/main/java/top/leavesmc/leaves/bot/BotCommand.java b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..17c1db261165bfa22a7e91189f926e0adf8e43f9
index 0000000000000000000000000000000000000000..3b8d44fb61d504e521e73d3a34f6bd8ad9f13aee
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
@@ -0,0 +1,96 @@
@@ -0,0 +1,101 @@
+package top.leavesmc.leaves.bot;
+
+import org.bukkit.Bukkit;
@@ -655,6 +683,11 @@ index 0000000000000000000000000000000000000000..17c1db261165bfa22a7e91189f926e0a
+ return;
+ }
+
+ if (top.leavesmc.leaves.LeavesConfig.unableFakeplayerNames.contains(args[1])) {
+ sender.sendMessage(ChatColor.RED + "This name is unable");
+ return;
+ }
+
+ Bot.createBot(((Player) sender).getLocation(), args[1]);
+ }
+

10
patches/server/0011-Add-fakeplayer-action-support.patch
View File

@@ -18,10 +18,10 @@ index 2483d7df7f1bf94344afd38b37602c645a4a2dff..4ef275139b0f1340238fbc48e9f522dd
if (itemstack.getItem() instanceof SwordItem) {
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 1931114944847708ba9e82ce3b82675f1d477446..578ef971b3684e64e116b486672b6bc2c9edbe0b 100644
index 898c61c25675232e203ee2c872ca25804c41358c..4d6d025c78086f186da710ae46f65eda5426464d 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -67,6 +67,7 @@ public final class LeavesConfig {
@@ -68,6 +68,7 @@ public final class LeavesConfig {
if (top.leavesmc.leaves.LeavesConfig.fakeplayerSupport) {
commands.put("bot", new BotCommand("bot"));
@@ -358,7 +358,7 @@ index ebea5607956b1328f928d905e4f35424e5c21546..77713ce098be75aab5ebbeabc324298d
Bot bot = null;
for (Bot b : bots) {
diff --git a/src/main/java/top/leavesmc/leaves/bot/BotCommand.java b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
index 17c1db261165bfa22a7e91189f926e0adf8e43f9..e65e4980665211ce170c78afb8dd431f80e73779 100644
index 3b8d44fb61d504e521e73d3a34f6bd8ad9f13aee..ec1c53e2f98717b648c80ddf7573edad7f29b135 100644
--- a/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
+++ b/src/main/java/top/leavesmc/leaves/bot/BotCommand.java
@@ -5,7 +5,11 @@ import org.bukkit.ChatColor;
@@ -431,7 +431,7 @@ index 17c1db261165bfa22a7e91189f926e0adf8e43f9..e65e4980665211ce170c78afb8dd431f
return;
}
@@ -80,7 +100,7 @@ public class BotCommand extends Command {
@@ -85,7 +105,7 @@ public class BotCommand extends Command {
private void onRemove(CommandSender sender, String[] args) {
if (args.length < 2) {
@@ -440,7 +440,7 @@ index 17c1db261165bfa22a7e91189f926e0adf8e43f9..e65e4980665211ce170c78afb8dd431f
return;
}
@@ -93,4 +113,31 @@ public class BotCommand extends Command {
@@ -98,4 +118,31 @@ public class BotCommand extends Command {
bot.kill();
}

6
patches/server/0012-Make-shears-in-dispenser-can-unlimited-use.patch
View File

@@ -18,11 +18,11 @@ index 2366d411bf64f88c7296e888cd3bf584825ae4a9..7da29029038d5a007735dcb2be011458
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 578ef971b3684e64e116b486672b6bc2c9edbe0b..93e74180d62a326891573e8ac5902e748db25a34 100644
index 4d6d025c78086f186da710ae46f65eda5426464d..3a682ee9fced138f4759b829ba2dbeeb658f71d1 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -145,6 +145,11 @@ public final class LeavesConfig {
fakeplayerSupport = getBoolean("settings.fakeplayer-support", fakeplayerSupport);
@@ -161,6 +161,11 @@ public final class LeavesConfig {
unableFakeplayerNames = getList("settings.fakeplayer.unable-fakeplayer-names", Arrays.asList("player-name"));
}
+ public static boolean shearsInDispenserCanZeroAmount = false;

4
patches/server/0013-Redstone-Shears-Wrench.patch
View File

@@ -100,10 +100,10 @@ index 78243f6defda3fd495dfb088df63075586c8a46f..c143e3a205e86e92d4b43692a0ac3081
+ // Leaves end - shears wrench
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 93e74180d62a326891573e8ac5902e748db25a34..2252014963e42b0bd38771f30e68135b3ef18d1d 100644
index 3a682ee9fced138f4759b829ba2dbeeb658f71d1..ac1dbdab5e7c3cdbacf50c640ccd59eb9eaa530c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -150,6 +150,11 @@ public final class LeavesConfig {
@@ -166,6 +166,11 @@ public final class LeavesConfig {
shearsInDispenserCanZeroAmount = getBoolean("settings.shears-in-dispenser-can-zero-amount", shearsInDispenserCanZeroAmount);
}

4
patches/server/0015-Budding-Amethyst-can-push-by-piston.patch
View File

@@ -21,10 +21,10 @@ index 02fc3ede12eadbf72e26e31b1c475c7f5b2ad73a..55bd00dca1553b5762e1d4f79cdfe6a3
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 2252014963e42b0bd38771f30e68135b3ef18d1d..5b1b3627b195f25a1c1daa509e58186bcff1c498 100644
index ac1dbdab5e7c3cdbacf50c640ccd59eb9eaa530c..af924f19ca0c77484ae3cdeb2994547b63213767 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -155,6 +155,11 @@ public final class LeavesConfig {
@@ -171,6 +171,11 @@ public final class LeavesConfig {
redstoneShearsWrench = getBoolean("settings.redstone-shears-wrench", redstoneShearsWrench);
}