Skip to content

Commit 93425f2

Browse files
Use new gamerules
1 parent 7c9ae81 commit 93425f2

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

src/main/java/fr/openmc/core/features/dream/generation/DreamDimensionManager.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
import fr.openmc.core.features.dream.generation.structures.soulforest.SoulAltarStructure;
1616
import fr.openmc.core.utils.structure.FeaturesPopulator;
1717
import fr.openmc.core.utils.structure.SchematicsUtils;
18-
import org.bukkit.Bukkit;
19-
import org.bukkit.GameRule;
20-
import org.bukkit.World;
21-
import org.bukkit.WorldCreator;
18+
import org.bukkit.*;
2219
import org.bukkit.block.Biome;
2320
import org.bukkit.configuration.file.FileConfiguration;
2421
import org.bukkit.configuration.file.YamlConfiguration;
@@ -122,15 +119,15 @@ public static void createDimension() {
122119
registeredFeatures.forEach(populator -> dream.getPopulators().add(populator));
123120

124121
// ** SET GAMERULE FOR THE WORLD **
125-
dream.setGameRule(GameRule.DO_DAYLIGHT_CYCLE, false);
126-
dream.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
127-
dream.setGameRule(GameRule.DO_WEATHER_CYCLE, false);
128-
dream.setGameRule(GameRule.DISABLE_RAIDS, true);
129-
dream.setGameRule(GameRule.DO_PATROL_SPAWNING, false);
130-
dream.setGameRule(GameRule.DO_TRADER_SPAWNING, false);
131-
dream.setGameRule(GameRule.NATURAL_REGENERATION, false);
132-
dream.setGameRule(GameRule.LOCATOR_BAR, false);
133-
dream.setGameRule(GameRule.ALLOW_ENTERING_NETHER_USING_PORTALS, false);
122+
dream.setGameRule(GameRules.ADVANCE_TIME, false);
123+
dream.setGameRule(GameRules.SHOW_ADVANCEMENT_MESSAGES, false);
124+
dream.setGameRule(GameRules.ADVANCE_WEATHER, false);
125+
dream.setGameRule(GameRules.RAIDS, true);
126+
dream.setGameRule(GameRules.SPAWN_PATROLS, false);
127+
dream.setGameRule(GameRules.SPAWN_WANDERING_TRADERS, false);
128+
dream.setGameRule(GameRules.NATURAL_HEALTH_REGENERATION, false);
129+
dream.setGameRule(GameRules.LOCATOR_BAR, false);
130+
dream.setGameRule(GameRules.ALLOW_ENTERING_NETHER_USING_PORTALS, false);
134131

135132
dream.setTime(18000);
136133

src/main/java/fr/openmc/core/listeners/SleepListener.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package fr.openmc.core.listeners;
22

33
import org.bukkit.GameRule;
4+
import org.bukkit.GameRules;
45
import org.bukkit.World;
56
import org.bukkit.event.EventHandler;
67
import org.bukkit.event.Listener;
@@ -38,21 +39,21 @@ public class SleepListener implements Listener {
3839
@EventHandler
3940
public void onPlayerJoin(PlayerJoinEvent event) {
4041
World world = event.getPlayer().getWorld();
41-
world.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() + 1));
42+
world.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() + 1));
4243
}
4344

4445
@EventHandler
4546
public void onQuit(PlayerQuitEvent event) {
4647
World world = event.getPlayer().getWorld();
47-
world.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() - 1));
48+
world.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(world.getPlayers().size() - 1));
4849
}
4950

5051
@EventHandler
5152
public void onChangeWorld(PlayerChangedWorldEvent event) {
5253
World oldWorld = event.getFrom();
5354
World newWorld = event.getPlayer().getWorld();
54-
oldWorld.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(oldWorld.getPlayers().size()));
55-
newWorld.setGameRule(GameRule.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(newWorld.getPlayers().size()));
55+
oldWorld.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(oldWorld.getPlayers().size()));
56+
newWorld.setGameRule(GameRules.PLAYERS_SLEEPING_PERCENTAGE, getPercentage(newWorld.getPlayers().size()));
5657
}
5758

5859
/**

0 commit comments

Comments
 (0)