Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-03 06:01:27 +01:00
Code Issues Projects Releases Wiki Activity

Add per-arena setting: display-timer-as-level

Browse Source
This commit is contained in:
garbagemule 2013-06-22 13:06:44 +02:00
parent fe8a8ffa80
commit 069394c9f5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/res/settings.yml
View File

@ -36,3 +36,4 @@ auto-start-timer: 0
auto-ready: false auto-ready: false
use-class-chests: false use-class-chests: false
display-waves-as-level: false display-waves-as-level: false
display-timer-as-level: false

2
src/com/garbagemule/MobArena/ArenaImpl.java
View File

@ -871,7 +871,7 @@ public class ArenaImpl implements Arena
} }
rewardManager.grantRewards(p); rewardManager.grantRewards(p);
if (!settings.getBoolean("keep-exp", false)) { if (lobbyPlayers.contains(p) || !settings.getBoolean("keep-exp", false)) {
playerData.get(p).restoreData(); playerData.get(p).restoreData();
} }
else { else {

16
src/com/garbagemule/MobArena/autostart/AutoStartTimer.java
View File

@ -1,5 +1,7 @@
package com.garbagemule.MobArena.autostart; package com.garbagemule.MobArena.autostart;
import org.bukkit.entity.Player;
import com.garbagemule.MobArena.Messenger; import com.garbagemule.MobArena.Messenger;
import com.garbagemule.MobArena.Msg; import com.garbagemule.MobArena.Msg;
import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.Arena;
@ -9,11 +11,13 @@ public class AutoStartTimer {
private int seconds; private int seconds;
private Timer timer; private Timer timer;
private boolean started; private boolean started;
private boolean useLevels;
public AutoStartTimer(Arena arena, int seconds) { public AutoStartTimer(Arena arena, int seconds) {
this.arena = arena; this.arena = arena;
this.seconds = seconds; this.seconds = seconds;
this.started = false; this.started = false;
this.useLevels = arena.getSettings().getBoolean("display-timer-as-level", false);
} }
/** /**
@ -93,9 +97,15 @@ public class AutoStartTimer {
if (remaining <= 0) { if (remaining <= 0) {
arena.forceStart(); arena.forceStart();
started = false; started = false;
} else { } else {
// Warn at x seconds left // If using levels, update 'em
if (remaining == intervals[countdownIndex]) { if (useLevels) {
for (Player p : arena.getPlayersInLobby()) {
p.setLevel(remaining);
}
}
// Otherwise, warn at x seconds left
else if (remaining == intervals[countdownIndex]) {
Messenger.tellAll(arena, Msg.ARENA_AUTO_START, "" + remaining); Messenger.tellAll(arena, Msg.ARENA_AUTO_START, "" + remaining);
countdownIndex--; countdownIndex--;
} }