Added bindLocation variable, clone location shows bind spot in yellow, fixed incap and db messages

This commit is contained in:
Waverunner
2014-05-10 16:38:59 -04:00
parent 994340373d
commit b5344eab07
5 changed files with 43 additions and 17 deletions
+5 -5
View File
@@ -490,15 +490,15 @@ public class PlayerService implements INetworkDispatch {
SWGObject preDesignatedCloner = null;
if(creature.getAttachment("preDesignatedCloner") != null) {
preDesignatedCloner = core.objectService.getObject((long) creature.getAttachment("preDesignatedCloner"));
if(creature.getPlayerObject().getBindLocation() != 0) {
preDesignatedCloner = core.objectService.getObject((long) creature.getPlayerObject().getBindLocation());
if(preDesignatedCloner != null)
cloneData.put(preDesignatedCloner.getObjectID(), core.mapService.getClosestCityName(preDesignatedCloner) /*+ " (" + String.valueOf(position.getDistance2D(cloner.getPosition())) + "m)"*/);
cloneData.put(preDesignatedCloner.getObjectID(), "@base_player:clone_location_registered_select_begin " + core.mapService.getClosestCityName(preDesignatedCloner) + " @base_player:clone_location_registered_select_end");
}
final long preDesignatedObjectId = (preDesignatedCloner != null) ? preDesignatedCloner.getObjectID() : 0;
cloners.stream().filter(c -> c.getObjectID() != preDesignatedObjectId).forEach(c -> cloneData.put(c.getObjectID(), core.mapService.getClosestCityName(c)));
final SUIWindow window = core.suiService.createListBox(ListBoxType.LIST_BOX_OK_CANCEL, "@base_player:revive_title", "Select the desired option and click OK.",
final SUIWindow window = core.suiService.createListBox(ListBoxType.LIST_BOX_OK_CANCEL, "@base_player:revive_title", "@base_player:clone_prompt_header",
cloneData, creature, null, 0);
Vector<String> returnList = new Vector<String>();
returnList.add("List.lstList:SelectedRow");
@@ -555,7 +555,7 @@ public class PlayerService implements INetworkDispatch {
}
creature.setFactionStatus(0);
core.buffService.addBuffToCreature(creature, "cloning_sickness");
core.buffService.addBuffToCreature(creature, "cloning_sickness", creature);
}