Skip to content

Commit cdfd8ee

Browse files
committed
jk slight code edits
1 parent 477898e commit cdfd8ee

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

src/main/java/adhdmc/sleepmessages/SleepCommands.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
import org.bukkit.command.Command;
55
import org.bukkit.command.CommandExecutor;
66
import org.bukkit.command.CommandSender;
7-
import org.bukkit.command.TabExecutor;
87
import org.jetbrains.annotations.NotNull;
9-
import org.jetbrains.annotations.Nullable;
108

11-
import java.util.List;
129

1310
public class SleepCommands implements CommandExecutor {
1411
MiniMessage mM = MiniMessage.miniMessage();

src/main/java/adhdmc/sleepmessages/SleepListener.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,42 @@
99
import org.bukkit.entity.Player;
1010
import org.bukkit.event.EventHandler;
1111
import org.bukkit.event.Listener;
12-
import org.bukkit.event.player.PlayerBedLeaveEvent;
1312
import org.bukkit.event.world.TimeSkipEvent;
1413

1514
import java.util.List;
16-
import java.util.Objects;
1715

1816
public class SleepListener implements Listener {
1917

2018
@EventHandler
21-
public void onPlayerSleep(PlayerDeepSleepEvent event){
19+
public void onPlayerSleep(PlayerDeepSleepEvent event) {
2220
FileConfiguration config = SleepMessages.plugin.getConfig();
23-
if(config.getString("player-sleep-message") == null || Objects.equals(config.getString("player-sleep-message"), "")) return;
24-
String sleepMessage = config.getString("player-sleep-message");
21+
String sleepMessage = config.getString("player-sleep-message", "");
22+
if (sleepMessage.isEmpty()) return;
2523
World world = event.getPlayer().getWorld();
2624
String playerName = event.getPlayer().getName();
2725
String worldName = world.getName();
2826
int currentSleepCount = 0;
2927
int worldOnlineTotal = world.getPlayerCount();
3028
Integer worldSleepPercent = world.getGameRuleValue(GameRule.PLAYERS_SLEEPING_PERCENTAGE);
31-
Integer neededSleepers = (worldSleepPercent/100)*worldOnlineTotal;
29+
Integer neededSleepers = (worldSleepPercent / 100) * worldOnlineTotal;
3230
List<Player> playerList = world.getPlayers();
33-
for (Player player : playerList){
34-
if(player.isDeeplySleeping()) currentSleepCount += 1;
31+
for (Player player : playerList) {
32+
if (player.isDeeplySleeping()) currentSleepCount += 1;
3533
}
3634
world.sendMessage(MiniMessage.miniMessage().deserialize(sleepMessage,
3735
Placeholder.unparsed("playername", playerName),
3836
Placeholder.unparsed("sleeping", String.valueOf(currentSleepCount)),
3937
Placeholder.unparsed("needed", String.valueOf(neededSleepers)),
4038
Placeholder.unparsed("worldname", worldName)));
4139
}
40+
4241
@EventHandler
43-
public void nightSkip(TimeSkipEvent event){
42+
public void nightSkip(TimeSkipEvent event) {
4443
FileConfiguration config = SleepMessages.plugin.getConfig();
45-
if(!event.getSkipReason().equals(TimeSkipEvent.SkipReason.NIGHT_SKIP)) return;
46-
if(config.getString("night-skip-message") == null || config.getString("night-skip-message").equals("")) return;
47-
String skipMessage = config.getString("night-skip-message");
44+
if (!event.getSkipReason().equals(TimeSkipEvent.SkipReason.NIGHT_SKIP)) return;
45+
String skipMessage = config.getString("night-skip-message", "");
46+
if (skipMessage.isEmpty()) return;
4847
String worldName = event.getWorld().getName();
4948
event.getWorld().sendMessage(MiniMessage.miniMessage().deserialize(skipMessage, Placeholder.unparsed("worldname", worldName)));
5049
}
51-
5250
}

src/main/java/adhdmc/sleepmessages/SleepMessages.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public final class SleepMessages extends JavaPlugin {
99
public void onEnable() {
1010
plugin = this;
1111
this.getConfig().addDefault("player-sleep-message", "<grey><playername> has fallen asleep. <sleeping> out of <needed> required players in <worldname> are sleeping.");
12-
this.getConfig().addDefault("player-leave-bed-message", "<grey><playername> has left their bed. There are now <sleeping> out of <needed> players in <worldname> sleeping");
1312
this.getConfig().addDefault("night-skip-message", "<grey>Enough players have slept! Skipping through the night in <worldname>.");
1413
this.saveDefaultConfig();
1514
this.getServer().getPluginManager().registerEvents(new SleepListener(), this);

0 commit comments

Comments
 (0)