projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-19 09:03:02 -04:00
Code Issues Projects Releases Wiki Activity

DeathblowIntent is now only used for deathblow requests

Browse Source
This commit is contained in:
Mads Boddum
2016-10-03 13:26:08 +02:00
parent bc61075d6b
commit 0d42d02749
3 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatManager.java
+22 -25
View File
@@ -383,36 +383,33 @@ public class CombatManager extends Manager {
}
private void procesDeathblow(DeathblowIntent i) {
if(i.isRequest()) {
CreatureObject killerCreature = i.getKillerCreature();
CreatureObject killedCreature = i.getKilledCreature();
// Only players may deathblow eachother
if(killerCreature.isPlayer() && killedCreature.isPlayer()) {
// They must be enemies
if(killedCreature.isEnemy(killerCreature)) {
// The target of the deathblow must be incapacitated!
if(killedCreature.getPosture() == Posture.INCAPACITATED) {
// If this happens, they obviously can't get back up
synchronized (incapacitatedCreatures) {
Future<?> incapacitationTimer = incapacitatedCreatures.remove(killedCreature);
if(incapacitationTimer != null) {
if(incapacitationTimer.cancel(false)) { // If the task is running, let them get back up
killCreature(killerCreature, killedCreature);
new DeathblowIntent(false, killerCreature, killedCreature).broadcast();
Log.i(this, "%s was deathblown by %s", killedCreature, killerCreature);
}
} else {
// Can't happen with the current code, but in case it's ever refactored...
Log.e(this, "Incapacitation timer for player %s being deathblown unexpectedly didn't exist!", "");
CreatureObject killerCreature = i.getKillerCreature();
CreatureObject killedCreature = i.getKilledCreature();
// Only players may deathblow eachother
if (killerCreature.isPlayer() && killedCreature.isPlayer()) {
// They must be enemies
if (killedCreature.isEnemy(killerCreature)) {
// The target of the deathblow must be incapacitated!
if (killedCreature.getPosture() == Posture.INCAPACITATED) {
// If this happens, they obviously can't get back up
synchronized (incapacitatedCreatures) {
Future<?> incapacitationTimer = incapacitatedCreatures.remove(killedCreature);
if (incapacitationTimer != null) {
if (incapacitationTimer.cancel(false)) { // If the task is running, let them get back up
killCreature(killerCreature, killedCreature);
Log.i(this, "%s was deathblown by %s", killedCreature, killerCreature);
}
} else {
// Can't happen with the current code, but in case it's ever refactored...
Log.e(this, "Incapacitation timer for player %s being deathblown unexpectedly didn't exist!", "");
}
}
}
} else {
Log.i(this, "%s tried to deathblow NPC %s", killerCreature, killedCreature);
}
} else {
Log.i(this, "%s tried to deathblow NPC %s", killerCreature, killedCreature);
}
}