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

Merge origin/deathblow into cloning

Browse Source 
Conflicts:
	src/services/combat/CorpseService.java
This commit is contained in:
Mads Boddum
2016-10-10 12:58:44 +02:00
parent 6cafb546fc 31374b3e2c
commit 134ffb1ca9
4 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CorpseService.java
+3 -3
View File
@@ -207,11 +207,11 @@ public final class CorpseService extends Service {
}
private void handleCreatureKilledIntent(CreatureKilledIntent i) {
CreatureObject corpse = i.getKilledCreature();
CreatureObject corpse = i.getCorpse();
if(corpse.isPlayer()) {
Player corpseOwner = corpse.getOwner();
new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "prose_victim_dead"), "TT", i.getKillerCreature().getName())).broadcast();
new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "prose_victim_dead"), "TT", i.getKiller().getName())).broadcast();
new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "revive_exp_msg"), "TT", CLONE_TIMER + " minutes.")).broadcast();
scheduleCloneTimer(corpse);
@@ -566,4 +566,4 @@ public final class CorpseService extends Service {
}
}
}
}