Parker Hawke / CraftBukkit / 62d976242c2

Commits

Doc authored and md_5 committed 62d976242c2 21 Feb 2022

SPIGOT-6900, SPIGOT-6330: Make /difficulty command per-world

Added

-+
+--- a/net/minecraft/server/commands/CommandDifficulty.java
-+
++++ b/net/minecraft/server/commands/CommandDifficulty.java
-+
+@@ -42,11 +42,12 @@
-+
-+
+     public static int setDifficulty(CommandListenerWrapper commandlistenerwrapper, EnumDifficulty enumdifficulty) throws CommandSyntaxException {
-+
+         MinecraftServer minecraftserver = commandlistenerwrapper.getServer();
-+
++        net.minecraft.server.level.WorldServer worldServer = commandlistenerwrapper.getLevel(); // CraftBukkit
-+
-+
+-        if (minecraftserver.getWorldData().getDifficulty() == enumdifficulty) {
-+
++        if (worldServer.getDifficulty() == enumdifficulty) { // CraftBukkit
-+
+             throw CommandDifficulty.ERROR_ALREADY_DIFFICULT.create(enumdifficulty.getKey());
-+
+         } else {
-+
+-            minecraftserver.setDifficulty(enumdifficulty, true);
-+
++            worldServer.serverLevelData.setDifficulty(enumdifficulty); // CraftBukkit
-+
+             commandlistenerwrapper.sendSuccess(new ChatMessage("commands.difficulty.success", new Object[]{enumdifficulty.getDisplayName()}), true);
-+
+             return 0;
-+
+         }