projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-16 08:13:22 -04:00
Code Issues Projects Releases Wiki Activity

Cloned players now go on leave

Browse Source
This commit is contained in:
Mads Boddum
2016-10-13 04:24:42 +02:00
parent 291961eac0
commit f80008bc5a
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/faction/FactionService.java
+8 -14
View File
@@ -53,18 +53,14 @@ import utilities.ThreadUtilities;
public final class FactionService extends Service {
private ScheduledExecutorService executor;
private Map<TangibleObject, Future<?>> statusChangers;
private final ScheduledExecutorService executor;
private final Map<TangibleObject, Future<?>> statusChangers;
public FactionService() {
registerForIntent(FactionIntent.TYPE);
}
@Override
public boolean initialize() {
statusChangers = new HashMap<>();
executor = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("faction-service"));
return super.initialize();
registerForIntent(FactionIntent.TYPE);
}
@Override
@@ -76,10 +72,8 @@ public final class FactionService extends Service {
@Override
public boolean terminate() {
if (executor != null) {
// If some were in the middle of switching, finish the switches immediately
executor.shutdownNow().forEach(runnable -> runnable.run());
}
// If some were in the middle of switching, finish the switches immediately
executor.shutdownNow().forEach(runnable -> runnable.run());
return super.terminate();
}
@@ -216,11 +210,11 @@ public final class FactionService extends Service {
} else {
// Their new status does not equal the one we want - apply the new one
changeStatus(target, oldStatus, newStatus);
target.setPvpStatus(newStatus);
}
} else {
// They're not currently waiting to switch to a new status - change now
changeStatus(target, oldStatus, newStatus);
target.setPvpStatus(newStatus);
}
}