projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Added duels, added incap and deathblow, fixed some buff issues

Browse Source
This commit is contained in:
Light2
2013-09-14 22:25:52 +02:00
parent 2768c20dff
commit f829fa638b
25 changed files with 408 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+5 -1
View File
@@ -136,6 +136,10 @@ public class SimulationService implements INetworkDispatch {
core.commandService.registerCommand("addfriend");
core.commandService.registerCommand("removefriend");
core.commandService.registerCommand("getfriendlist");
core.commandService.registerCommand("deathblow");
core.commandService.registerCommand("endduel");
core.commandService.registerCommand("duel");
}
public void add(SWGObject object, int x, int y) {
@@ -663,7 +667,7 @@ public class SimulationService implements INetworkDispatch {
if(object == obj1 || object == obj2)
continue;
if(object.getTemplateData().getAttribute("collisionActionBlockFlags") != null) {
if(object.getTemplateData() != null && object.getTemplateData().getAttribute("collisionActionBlockFlags") != null) {
int bit = (Integer) object.getTemplateData().getAttribute("collisionActionBlockFlags") & 255;
if(bit == (Integer) object.getTemplateData().getAttribute("collisionActionBlockFlags"))
continue;