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

Added terrain mapping support for buildout areas

Browse Source
This commit is contained in:
Mads Boddum
2016-10-10 12:01:44 +02:00
parent 02bc31145f
commit 5b57d8091e
3 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/faction/FactionService.java
+36 -12
View File
@@ -37,6 +37,9 @@ import network.packets.swg.zone.chat.ChatSystemMessage;
import network.packets.swg.zone.chat.ChatSystemMessage.SystemChatType;
import intents.FactionIntent;
import intents.PlayerEventIntent;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Future;
import resources.PvpFaction;
import resources.PvpFlag;
import resources.PvpStatus;
@@ -46,10 +49,12 @@ import resources.objects.SWGObject;
import resources.objects.creature.CreatureObject;
import resources.objects.tangible.TangibleObject;
import resources.player.Player;
import utilities.ThreadUtilities;
public final class FactionService extends Service {
private ScheduledExecutorService executor;
private Map<TangibleObject, Future<?>> statusChangers;
public FactionService() {
registerForIntent(FactionIntent.TYPE);
@@ -57,7 +62,8 @@ public final class FactionService extends Service {
@Override
public boolean initialize() {
executor = Executors.newSingleThreadScheduledExecutor();
statusChangers = new HashMap<>();
executor = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("faction-service"));
return super.initialize();
}
@@ -70,17 +76,11 @@ public final class FactionService extends Service {
@Override
public boolean terminate() {
boolean success = true;
try {
if (executor != null) {
executor.shutdownNow();
success = executor.awaitTermination(5, TimeUnit.SECONDS);
}
} catch (InterruptedException e) {
e.printStackTrace();
success = false;
if (executor != null) {
executor.shutdownNow().forEach(runnable -> runnable.run());
}
return super.terminate() && success;
return super.terminate();
}
private void handleFactionIntent(FactionIntent i) {
@@ -88,6 +88,9 @@ public final class FactionService extends Service {
case FACTIONUPDATE:
handleTypeChange(i);
break;
case SWITCHUPDATE:
handleSwitchChange(i);
break;
case STATUSUPDATE:
handleStatusChange(i);
break;
@@ -161,7 +164,7 @@ public final class FactionService extends Service {
}
}
private void handleStatusChange(FactionIntent fi) {
private void handleSwitchChange(FactionIntent fi) {
final PvpFlag pvpFlag;
final TangibleObject target = fi.getTarget();
final PvpStatus currentStatus = target.getPvpStatus();
@@ -193,6 +196,27 @@ public final class FactionService extends Service {
}
}
private void handleStatusChange(FactionIntent fi) {
// If they're currently going OVERT or COVERT, we need to handle it accordingly
// Forces them into the given PvpStatus!
TangibleObject target = fi.getTarget();
PvpStatus oldStatus = target.getPvpStatus();
PvpStatus newStatus = fi.getNewStatus();
// No reason to send deltas and all that if the status isn't effectively changing
if(oldStatus == newStatus)
return;
// Let's clear PvP flags in case they were in the middle of going covert/overt
Future<?> future = statusChangers.get(target);
future.cancel(true);
target.setPvpStatus(newStatus);
target.getOwner().sendPacket(new ChatSystemMessage(
SystemChatType.SCREEN_AND_CHAT,
getCompletionMessage(oldStatus, newStatus)));
}
private void handleFlagChange(TangibleObject object) {
Player objOwner = object.getOwner();