Added buildout option (may clash, PM if need help)

If you have snapshot objects disabled, I recommend setting the option in
options.cfg to 1 before syncing, then setting it back afterwards, to
avoid a merge clash.
This commit is contained in:
Treeku
2013-12-14 10:25:56 +00:00
parent a67cbb0992
commit 44422ffb42
3 changed files with 12 additions and 3 deletions
+2 -2
View File
@@ -221,7 +221,7 @@ public class ObjectService implements INetworkDispatch {
object.setPlanetId(planet.getID());
object.setAttachment("serverTemplate", ((customServerTemplate != null) ? customServerTemplate : object.getTemplate()));
object.setAttachment("customServerTemplate", customServerTemplate);
object.setisInSnapshot(isSnapshot);
loadServerTemplate(object);
@@ -264,7 +264,7 @@ public class ObjectService implements INetworkDispatch {
public void loadServerTemplate(SWGObject object) {
String template = ((object.getAttachment("serverTemplate") == null) ? object.getTemplate() : (object.getTemplate().split("shared_")[0] + "shared_" + ((String) object.getAttachment("serverTemplate")) + ".iff"));
String template = ((object.getAttachment("customServerTemplate") == null) ? object.getTemplate() : (object.getTemplate().split("shared_")[0] + "shared_" + ((String) object.getAttachment("customServerTemplate")) + ".iff"));
String serverTemplate = template.replace(".iff", "");
// check if template is empty(4 default lines) to reduce RAM usage(saves about 500 MB of RAM)
try {