projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-22 07:13:28 -04:00
Code Issues Projects Releases Wiki Activity

Removed reuse_item condition from timer items

Browse Source
This commit is contained in:
Treeku
2014-05-04 18:41:14 +01:00
parent e161871ee4
commit 94c2f19ed4
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+27 -29
View File
@@ -675,41 +675,39 @@ public class ObjectService implements INetworkDispatch {
reuse_time = 0;
}
if (reuse_time > 0) {
try {
DatatableVisitor visitor = ClientFileManager.loadFile("datatables/timer/template_command_mapping.iff", DatatableVisitor.class);
for (int i = 0; i < visitor.getRowCount(); i++) {
if (visitor.getObject(i, 0) != null && ((String) (visitor.getObject(i, 0))).equalsIgnoreCase(object.getTemplate())) {
String commandName = (String) visitor.getObject(i, 1);
String cooldownGroup = (String) visitor.getObject(i, 2);
String animation = (String) visitor.getObject(i, 3);
try {
DatatableVisitor visitor = ClientFileManager.loadFile("datatables/timer/template_command_mapping.iff", DatatableVisitor.class);
for (int i = 0; i < visitor.getRowCount(); i++) {
if (visitor.getObject(i, 0) != null && ((String) (visitor.getObject(i, 0))).equalsIgnoreCase(object.getTemplate())) {
String commandName = (String) visitor.getObject(i, 1);
String cooldownGroup = (String) visitor.getObject(i, 2);
String animation = (String) visitor.getObject(i, 3);
if (commandName.length() > 0) {
BaseSWGCommand command = core.commandService.getCommandByName(commandName);
if (commandName.length() > 0) {
BaseSWGCommand command = core.commandService.getCommandByName(commandName);
if (command instanceof CombatCommand && animation.length() > 0) {
((CombatCommand) command).setDefaultAnimations(new String[] { animation });
}
if (core.commandService.callCommand(creature, object, command, 0, "")) {
core.commandService.removeCommand(creature, 0, command);
return;
}
} else if (cooldownGroup.length() > 0) {
if (creature.hasCooldown(cooldownGroup)) {
return;
}
creature.addCooldown(cooldownGroup, object.getIntAttribute("reuse_time"));
if (command instanceof CombatCommand && animation.length() > 0) {
((CombatCommand) command).setDefaultAnimations(new String[] { animation });
}
break;
if (core.commandService.callCommand(creature, object, command, 0, "")) {
core.commandService.removeCommand(creature, 0, command);
return;
}
} else if (cooldownGroup.length() > 0) {
if (creature.hasCooldown(cooldownGroup)) {
return;
}
creature.addCooldown(cooldownGroup, object.getIntAttribute("reuse_time"));
}
break;
}
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
if (object instanceof TangibleObject) {