projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Seefo
2014-06-21 23:11:24 -04:00
parent 0b315503f0 24140e043b
commit e40ea9a8b8
43 changed files with 786 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/LootService.java
+2 -2
View File
@@ -758,8 +758,8 @@ public class LootService implements INetworkDispatch {
droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection);
//droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF ");
//core.collectionService.addCollection(actor, "new_prof_officer_master")
droppedItem.setAttachment("radial_filename", "item/collection/loot_collection");
droppedItem.setAttachment("AddToCollection", addToCollection);
droppedItem.setAttachment("radial_filename", "item/collection");
//System.out.println("collection");
}
@@ -1225,7 +1225,7 @@ public class LootService implements INetworkDispatch {
droppedItem.getAttributes().put("@obj_attr_n:collection_name", "@collection_n:"+addToCollection);
//droppedItem.getAttributes().put("@obj_attr_n:collection_name", "\\#FFFF00 @collection_n:"+addToCollection + " \\#FFFFFF ");
//core.collectionService.addCollection(actor, "new_prof_officer_master")
droppedItem.setAttachment("radial_filename", "item/loot_collection");
droppedItem.setAttachment("radial_filename", "item/collection");
}