-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SPIGOT-7680: Per-world weather command
- Loading branch information
Showing
1 changed file
with
34 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
nms-patches/net/minecraft/server/commands/CommandWeather.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- a/net/minecraft/server/commands/CommandWeather.java | ||
+++ b/net/minecraft/server/commands/CommandWeather.java | ||
@@ -34,11 +34,11 @@ | ||
} | ||
|
||
private static int getDuration(CommandListenerWrapper commandlistenerwrapper, int i, IntProvider intprovider) { | ||
- return i == -1 ? intprovider.sample(commandlistenerwrapper.getServer().overworld().getRandom()) : i; | ||
+ return i == -1 ? intprovider.sample(commandlistenerwrapper.getLevel().getRandom()) : i; // CraftBukkit - SPIGOT-7680: per-world | ||
} | ||
|
||
private static int setClear(CommandListenerWrapper commandlistenerwrapper, int i) { | ||
- commandlistenerwrapper.getServer().overworld().setWeatherParameters(getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DELAY), 0, false, false); | ||
+ commandlistenerwrapper.getLevel().setWeatherParameters(getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DELAY), 0, false, false); // CraftBukkit - SPIGOT-7680: per-world | ||
commandlistenerwrapper.sendSuccess(() -> { | ||
return IChatBaseComponent.translatable("commands.weather.set.clear"); | ||
}, true); | ||
@@ -46,7 +46,7 @@ | ||
} | ||
|
||
private static int setRain(CommandListenerWrapper commandlistenerwrapper, int i) { | ||
- commandlistenerwrapper.getServer().overworld().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DURATION), true, false); | ||
+ commandlistenerwrapper.getLevel().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DURATION), true, false); // CraftBukkit - SPIGOT-7680: per-world | ||
commandlistenerwrapper.sendSuccess(() -> { | ||
return IChatBaseComponent.translatable("commands.weather.set.rain"); | ||
}, true); | ||
@@ -54,7 +54,7 @@ | ||
} | ||
|
||
private static int setThunder(CommandListenerWrapper commandlistenerwrapper, int i) { | ||
- commandlistenerwrapper.getServer().overworld().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.THUNDER_DURATION), true, true); | ||
+ commandlistenerwrapper.getLevel().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.THUNDER_DURATION), true, true); // CraftBukkit - SPIGOT-7680: per-world | ||
commandlistenerwrapper.sendSuccess(() -> { | ||
return IChatBaseComponent.translatable("commands.weather.set.thunder"); | ||
}, true); |