Skip to content

fix night/day #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
John-Paul-R merged 1 commit into from
Aug 31, 2026
Merged

fix night/day #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/main/java/com/fibermc/essentialcommands/commands/utility/DayCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,32 @@
import com.mojang.brigadier.exceptions.CommandSyntaxException;

import net.minecraft.commands.CommandSourceStack;
import net.minecraft.core.Holder;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.storage.ServerLevelData;
import net.minecraft.world.clock.ClockTimeMarkers;
import net.minecraft.world.clock.WorldClock;

import java.util.Optional;

public class DayCommand implements Command<CommandSourceStack> {
@Override
public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
CommandSourceStack source = context.getSource();
PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
ServerLevel world = source.getServer().overworld();
if (world.isBrightOutside()) {
ServerLevel level = source.getPlayer().level();

Optional<Holder<WorldClock>> clock = level.dimensionType().defaultClock();
if (clock.isEmpty()) {
playerData.sendCommandError("generic.level.no_clock");
return -2;
}

if (level.isBrightOutside()) {
playerData.sendCommandFeedback("cmd.day.error.already_daytime");
return -1;
}
long time = world.getGameTime();
long timeToDay = 24000L - time % 24000L;

((ServerLevelData)world.getLevelData()).setGameTime(time + timeToDay);

level.getServer().clockManager().moveToTimeMarker(clock.get(), ClockTimeMarkers.DAY);
playerData.sendCommandFeedback("cmd.day.feedback");
return 1;
}
Expand Down
22 changes: 15 additions & 7 deletions src/main/java/com/fibermc/essentialcommands/commands/utility/NightCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,32 @@
import com.mojang.brigadier.exceptions.CommandSyntaxException;

import net.minecraft.commands.CommandSourceStack;
import net.minecraft.core.Holder;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.storage.ServerLevelData;
import net.minecraft.world.clock.ClockTimeMarkers;
import net.minecraft.world.clock.WorldClock;

import java.util.Optional;

public class NightCommand implements Command<CommandSourceStack> {
@Override
public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
CommandSourceStack source = context.getSource();
PlayerData playerData = PlayerData.accessFromContextOrThrow(context);
ServerLevel world = source.getServer().overworld();
if (world.isDarkOutside()) {
ServerLevel level = source.getPlayer().level();

Optional<Holder<WorldClock>> clock = level.dimensionType().defaultClock();
if (clock.isEmpty()) {
playerData.sendCommandError("generic.level.no_clock");
return -2;
}

if (level.isDarkOutside()) {
playerData.sendCommandFeedback("cmd.night.error.already_nighttime");
return -1;
}
long time = world.getGameTime();
long timeToNight = 13000L - time % 24000L;

((ServerLevelData)world.getLevelData()).setGameTime(time + timeToNight);

level.getServer().clockManager().moveToTimeMarker(clock.get(), ClockTimeMarkers.NIGHT);
playerData.sendCommandFeedback("cmd.night.feedback");
return 1;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/data/essential_commands/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
"generic.confirm": "Confirm",
"generic.deny": "Deny",
"generic.accept": "Accept",
"generic.level.no_clock": "This dimension does not have a clock",

"essentialcommands.fullprefix": "[Essential Commands] ",
"essentialcommands.smallprefix": "[EC] ",
Expand Down