tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't dynamically change rotations when a mutation is queued

This commit is contained in:
Geoff Yoerger 2017-12-04 07:58:00 -06:00 committed by Ashcon Partovi
parent 3744813dd2
commit f2ed36bcb6
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PGM/src/main/java/tc/oc/pgm/mutation/MutationQueue.java
View File

@ -34,6 +34,10 @@ public class MutationQueue {
public ListenableFuture<Server> clear() {
return force(Collections.emptyList());
}
public boolean isEmpty() {
return minecraftService.getLocalServer().queued_mutations().isEmpty();
}
public ListenableFuture<Server> removeAll(final Collection<Mutation> mutations) {
Collection<Mutation> removed = mutations();

8
PGM/src/main/java/tc/oc/pgm/rotation/DynamicRotationListener.java
View File

@ -17,6 +17,7 @@ import tc.oc.commons.core.logging.Loggers;
import tc.oc.commons.core.plugin.PluginFacet;
import tc.oc.pgm.PGM;
import tc.oc.pgm.events.MatchEndEvent;
import tc.oc.pgm.mutation.MutationQueue;
import java.util.logging.Logger;
@ -26,12 +27,14 @@ public class DynamicRotationListener implements PluginFacet, Listener {
private final Audiences audiences;
private final OnlinePlayers players;
private final ConfigurationSection config;
private final MutationQueue mutationQueue;
@Inject DynamicRotationListener(Loggers loggers, Audiences audiences, OnlinePlayers players, Configuration config) {
@Inject DynamicRotationListener(Loggers loggers, Audiences audiences, OnlinePlayers players, Configuration config, MutationQueue mutationQueue) {
this.logger = loggers.get(getClass());
this.audiences = audiences;
this.players = players;
this.config = config.getConfigurationSection("rotation");
this.mutationQueue = mutationQueue;
}
@EventHandler(priority = EventPriority.MONITOR)
@ -40,6 +43,9 @@ public class DynamicRotationListener implements PluginFacet, Listener {
// Ignore if dynamic rotations are disabled or if there is only one rotation available
if (!config.getBoolean("dynamic", false) || rotationManager.getRotations().size() <= 1) return;
// If a mutation was set for the next map, don't change it yet.
if (mutationQueue.isEmpty()) return;
int playerCount = players.count() + Math.round(event.getMatch().getObservingPlayers().size() / 2);