Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-24 01:19:19 +00:00
Code Issues Releases Activity

fix import

Browse Source
This commit is contained in:
violetc
2022-03-09 09:19:31 +00:00
parent 61cfcf5c8e
commit 083458dc3c
9 changed files with 71 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/server/0008-Add-Leaves-Command.patch
View File

@@ -17,7 +17,7 @@ index e92b98177189df1b162b648c0e259035c7ec2263..4f0d97c51db4313a73e46878546ca4c1
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 85aec3b017e11ab94cc0846be019fb5d632127f9..d71577feb77a67d8a1e048b1fdd6d8ac276a6473 100644
index 3fb3fc5b30d3cb171047cfb9caebf064a83f02bc..5b33ca9c6e97dfb8cd60e08272c6bc8022ede687 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -988,6 +988,7 @@ public final class CraftServer implements Server {
@@ -29,20 +29,19 @@ index 85aec3b017e11ab94cc0846be019fb5d632127f9..d71577feb77a67d8a1e048b1fdd6d8ac
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 3350a80d8790a17b19155425a53291fc3be9b886..a73c79e57f51a6ab0f0d0b37fa6c87ff9bd69325 100644
index 34501df6372f40840208671953f7912ccc29e459..85a24dd51762b7590cc8116fb51b742174b85e7e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -1,13 +1,18 @@
package top.leavesmc.leaves;
import com.destroystokyo.paper.util.SneakyThrow;
+import net.minecraft.server.MinecraftServer;
@@ -4,6 +4,7 @@ import com.destroystokyo.paper.util.SneakyThrow;
import com.google.common.base.Throwables;
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
+
import java.io.File;
@@ -11,7 +12,9 @@ import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.HashMap;
@@ -51,7 +50,7 @@ index 3350a80d8790a17b19155425a53291fc3be9b886..a73c79e57f51a6ab0f0d0b37fa6c87ff
import java.util.logging.Level;
// Copy form Tuinity(https://github.com/Tuinity/Tuinity)
@@ -23,6 +28,7 @@ public final class LeavesConfig {
@@ -27,6 +30,7 @@ public final class LeavesConfig {
public static YamlConfiguration config;
private static int configVersion;
public static boolean createWorldSections = true;
@@ -59,16 +58,16 @@ index 3350a80d8790a17b19155425a53291fc3be9b886..a73c79e57f51a6ab0f0d0b37fa6c87ff
public static void init(final File file) {
LeavesConfig.configFile = file;
@@ -46,6 +52,8 @@ public final class LeavesConfig {
}
}
@@ -53,6 +57,8 @@ public final class LeavesConfig {
LeavesConfig.set("config-version-please-do-not-modify-me", CURRENT_CONFIG_VERSION);
+ commands = new HashMap<>();
LeavesConfig.load(config);
+
LeavesConfig.load(config);
+ commands = new HashMap<>();
}
@@ -91,6 +99,12 @@ public final class LeavesConfig {
public static void load(final YamlConfiguration config) {
@@ -93,6 +99,12 @@ public final class LeavesConfig {
snowballAndEggCanKnockback = getBoolean("settings.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
}