Force dropall

Lumine1909 · Aug 4, 2024 · 46ed2fa · 46ed2fa
1 parent 22f392c
commit 46ed2fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/patches/server/0006-Leaves-Server-Config-And-Command.patch b/patches/server/0006-Leaves-Server-Config-And-Command.patch
@@ -85,10 +85,10 @@ index c2c421b1caf76b40542fdc436801accbe97a38cb..29f139fb4d70a9a362ac0a30579eb0b4
                          .withRequiredArg()
 diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9d0f2aeaeadfc5f8ea0663bc7fb950894754c103
+index 0000000000000000000000000000000000000000..5009708d8875f2a88e76f4a48c180d616c2547a6
 --- /dev/null
 +++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
-@@ -0,0 +1,942 @@
+@@ -0,0 +1,939 @@
 +package org.leavesmc.leaves;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -244,9 +244,6 @@ index 0000000000000000000000000000000000000000..9d0f2aeaeadfc5f8ea0663bc7fb95089
 +    @GlobalConfig(name = "modify-config", category = {"modify", "fakeplayer"})
 +    public static boolean fakeplayerModifyConfig = false;
 +
-+    @GlobalConfig(name = "drop-on-remove", category = {"modify", "fakeplayer"})
-+    public static boolean fakeplayerDropOnRemove = true;
-+
 +    // Leaves end - modify - fakeplayer
 +
 +    // Leaves start - modify - minecraft-old

diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch
@@ -1510,10 +1510,10 @@ index 0000000000000000000000000000000000000000..0db337866c71283464d026a4f230016b
 +}
 diff --git a/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..828ee4161304fde46a219dca9b9ab03d0c88f7cb
+index 0000000000000000000000000000000000000000..1314bcb0dfa311d671fcdcfeee4a8394b69834ad
 --- /dev/null
 +++ b/src/main/java/org/leavesmc/leaves/bot/ServerBot.java
-@@ -0,0 +1,769 @@
+@@ -0,0 +1,767 @@
 +package org.leavesmc.leaves.bot;
 +
 +import com.google.common.collect.Lists;
@@ -1788,9 +1788,7 @@ index 0000000000000000000000000000000000000000..828ee4161304fde46a219dca9b9ab03d
 +        if (!new BotRemoveEvent(this.getBukkitPlayer(), reason, remover).callEvent()) {
 +            return;
 +        }
-+        if (LeavesConfig.fakeplayerDropOnRemove) {
-+            dropAll();
-+        }
++        dropAll();
 +        if (this.removeTaskId != -1) {
 +            Bukkit.getScheduler().cancelTask(this.removeTaskId);
 +            this.removeTaskId = -1;