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

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Light2
2013-12-14 21:42:46 +01:00
parent 5d824324c4 6b565dcd65
commit 9a67e1c7a3
76 changed files with 10607 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+2 -2
View File
@@ -225,7 +225,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);
@@ -268,7 +268,7 @@ public class ObjectService implements INetworkDispatch {
public void loadServerTemplate(SWGObject object) {
String template = ((object.getAttachment("serverTemplate") == null) ? object.getTemplate() : ((String) object.getAttachment("serverTemplate")));
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 {