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:
	src/resources/objects/creature/CreatureMessageBuilder.java
This commit is contained in:
Treeku
2014-04-26 00:12:22 +01:00
parent 5203f23524 6fc8c53bb9
commit 09a6aa05ac
415 changed files with 8652 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+10 -1
View File
@@ -295,7 +295,16 @@ public class CommandService implements INetworkDispatch {
}
}
processCommand(actor, target, command, actionCounter, commandArgs);
if(command instanceof CombatCommand) {
try {
processCommand(actor, target, (BaseSWGCommand) command.clone(), actionCounter, commandArgs);
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
}
else
processCommand(actor, target, command, actionCounter, commandArgs);
return true;
}