projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-29 05:04:23 +01:00
parent 73f8ad85bc 63d0c5020d
commit 02ff93312e
229 changed files with 6226 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+2
View File
@@ -991,6 +991,8 @@ public class CombatService implements INetworkDispatch {
if(target.getDuelList().contains(attacker)) handleEndDuel(target, attacker, false);
core.playerService.sendCloningWindow(target, attacker.getSlottedObject("ghost") != null);
//if (attacker.getSlottedObject("ghost") != null)
//core.playerService.sendSetBountyWindow(target, attacker);
}
public boolean areInDuel(CreatureObject creature1, CreatureObject creature2) {