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

Revival timer is now cancelled for disappeared players

Browse Source
This commit is contained in:
Mads Boddum
2016-10-10 13:38:15 +02:00
parent cc8ce0d135
commit 85037e4e17
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CorpseService.java
+19 -10
View File
@@ -246,16 +246,25 @@ public final class CorpseService extends Service {
}
private void handlePlayerEventIntent(PlayerEventIntent i) {
if(i.getEvent() != PlayerEvent.PE_FIRST_ZONE) {
return;
}
CreatureObject creature = i.getPlayer().getCreatureObject();
if(creature.getPosture() == Posture.DEAD && !reviveTimers.containsKey(creature)) {
// They're dead but they have no active revive timer.
// In this case, they died and the application was shut down and started back up.
scheduleCloneTimer(creature);
switch(i.getEvent()) {
case PE_DISAPPEAR:
CreatureObject creature = i.getPlayer().getCreatureObject();
Future<?> reviveTimer = reviveTimers.remove(creature);
if (reviveTimer != null) {
// They had an active timer when they disappeared
reviveTimer.cancel(false);
}
break;
case PE_FIRST_ZONE:
creature = i.getPlayer().getCreatureObject();
if (creature.getPosture() == Posture.DEAD && !reviveTimers.containsKey(creature)) {
// They're dead but they have no active revive timer.
// In this case, they didn't clone before the application was shut down and started back up.
scheduleCloneTimer(creature);
}
break;
}
}