2024-12-14 22:42:43 +01:00
|
|
|
--- a/net/minecraft/server/commands/DifficultyCommand.java
|
|
|
|
+++ b/net/minecraft/server/commands/DifficultyCommand.java
|
2024-12-17 16:50:59 +01:00
|
|
|
@@ -31,10 +_,10 @@
|
2024-12-14 22:42:43 +01:00
|
|
|
|
|
|
|
public static int setDifficulty(CommandSourceStack source, Difficulty difficulty) throws CommandSyntaxException {
|
|
|
|
MinecraftServer server = source.getServer();
|
|
|
|
- if (server.getWorldData().getDifficulty() == difficulty) {
|
2024-12-17 16:50:59 +01:00
|
|
|
+ if (source.getLevel().getDifficulty() == difficulty) { // CraftBukkit
|
2024-12-14 22:42:43 +01:00
|
|
|
throw ERROR_ALREADY_DIFFICULT.create(difficulty.getKey());
|
|
|
|
} else {
|
|
|
|
- server.setDifficulty(difficulty, true);
|
2024-12-17 16:50:59 +01:00
|
|
|
+ server.setDifficulty(source.getLevel(), difficulty, true); // Paper - per level difficulty; don't skip other difficulty-changing logic (fix upstream's fix)
|
2024-12-14 22:42:43 +01:00
|
|
|
source.sendSuccess(() -> Component.translatable("commands.difficulty.success", difficulty.getDisplayName()), true);
|
|
|
|
return 0;
|
|
|
|
}
|