Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add difficulty game rule; resolves #621

This commit is contained in:
Daniel Saukel 2020-04-04 01:11:22 +02:00
parent 38700a3c62
commit 12408d1e62
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/main/java/de/erethon/dungeonsxl/api/dungeon/GameRule.java
View File

@ -33,6 +33,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.bukkit.Difficulty;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -69,9 +70,13 @@ public class GameRule<V> {
*/ */
public static final GameRule<GameGoal> GAME_GOAL = new GameRule<>(GameGoal.class, "gameGoal", GameGoal.END); public static final GameRule<GameGoal> GAME_GOAL = new GameRule<>(GameGoal.class, "gameGoal", GameGoal.END);
/** /**
* The game mode. * The Vanilla game mode.
*/ */
public static final GameRule<GameMode> GAME_MODE = new GameRule<>(GameMode.class, "gameMode", GameMode.SURVIVAL); public static final GameRule<GameMode> GAME_MODE = new GameRule<>(GameMode.class, "gameMode", GameMode.SURVIVAL);
/**
* The Vanilla difficulty.
*/
public static final GameRule<Difficulty> DIFFICULTY = new GameRule<>(Difficulty.class, "difficulty", Difficulty.NORMAL);
/** /**
* If players may fly. * If players may fly.
*/ */

3
core/src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java
View File

@ -405,11 +405,12 @@ public class DGameWorld extends DInstanceWorld implements GameWorld {
public void startGame() { public void startGame() {
GameWorldStartGameEvent event = new GameWorldStartGameEvent(this, (DGame) getGame()); GameWorldStartGameEvent event = new GameWorldStartGameEvent(this, (DGame) getGame());
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
} }
world.setDifficulty(getRules().getState(GameRule.DIFFICULTY));
isPlaying = true; isPlaying = true;
for (DungeonSign sign : getDungeonSigns()) { for (DungeonSign sign : getDungeonSigns()) {