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

Merge remote-tracking branch 'origin/master' into Wave_Entertainer

Browse Source 
Conflicts:
	src/services/BuffService.java
	src/services/collections/CollectionService.java
This commit is contained in:
Waverunner
2014-03-23 14:32:45 -04:00
parent cf5c36dd29 679f427759
commit d108353614
118 changed files with 862 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+10 -2
View File
@@ -716,6 +716,8 @@ public class PlayerService implements INetworkDispatch {
try {
roadmap = ClientFileManager.loadFile("datatables/roadmap/item_rewards.iff", DatatableVisitor.class);
Vector<SWGObject> rewards = new Vector<SWGObject>();
for (int s = 0; s < roadmap.getRowCount(); s++) {
if (roadmap.getObject(s, 0) != null) {
if (((String) roadmap.getObject(s, 1)).equals(roadmapSkillName)) {
@@ -740,11 +742,12 @@ public class PlayerService implements INetworkDispatch {
item = (item.substring(0, (item.lastIndexOf("/") + 1)) + "shared_" + item.substring((item.lastIndexOf("/") + 1)));
} else {
customServerTemplate = item;
item = core.scriptService.callScript("scripts/roadmap/", "roadmap_rewards", "get", item).asString();
item = core.scriptService.callScript("scripts/roadmap/", player.getProfession(), "getRewards", item).asString();
}
if (item != null && item != "") {
creature.getSlottedObject("inventory").add(core.objectService.createObject(item, 0, creature.getPlanet(), new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), customServerTemplate));
SWGObject itemObj = core.objectService.createObject(item, 0, creature.getPlanet(), new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), customServerTemplate);
rewards.add(itemObj);
} else {
//System.out.println("Can't find template: " + item);
}
@@ -756,6 +759,11 @@ public class PlayerService implements INetworkDispatch {
}
}
}
if (rewards != null && !rewards.isEmpty()) {
giveItems(creature, (SWGObject[]) rewards.toArray());
}
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}