From 1b8c2918c30f6c2c79269aea0bd6cd55e9bc5efb Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 11 Apr 2020 08:28:21 +0000 Subject: [PATCH] Linux path separator for instances. Contributed by Sahar. --- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 2 +- .../org/l2jmobius/gameserver/model/instancezone/Instance.java | 2 +- .../l2jmobius/gameserver/instancemanager/InstanceManager.java | 2 +- .../org/l2jmobius/gameserver/model/instancezone/Instance.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 35a9668a32..e92483e039 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -228,7 +228,7 @@ public class InstanceManager implements IXmlReader case "instance": { final NamedNodeMap attrs = n.getAttributes(); - _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf("\\instances\\") + 11)); + _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf(File.separator + "instances" + File.separator) + 11)); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index a83115257c..6f5aa6069d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -459,7 +459,7 @@ public class Instance { // TODO: Cache templates. Document doc = null; - final File xml = new File(".\\data\\instances\\" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); + final File xml = new File("." + File.separator + "data" + File.separator + "instances" + File.separator + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 35a9668a32..e92483e039 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -228,7 +228,7 @@ public class InstanceManager implements IXmlReader case "instance": { final NamedNodeMap attrs = n.getAttributes(); - _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf("\\instances\\") + 11)); + _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf(File.separator + "instances" + File.separator) + 11)); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 06cd49fead..ab19914c62 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -459,7 +459,7 @@ public class Instance { // TODO: Cache templates. Document doc = null; - final File xml = new File(".\\data\\instances\\" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); + final File xml = new File("." + File.separator + "data" + File.separator + "instances" + File.separator + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();