From c9153084b1d29500846480bd20a8a81b9c4d9577 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 16 Mar 2020 22:11:28 +0000 Subject: [PATCH] Alternate method for getting instance XML path. --- .../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 5a94f4124d..35a9668a32 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"), new File("data/instances/").toURI().relativize(f.toURI()).getPath()); + _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf("\\instances\\") + 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 5a46f63421..a83115257c 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(Config.DATAPACK_ROOT, "data/instances/" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); + final File xml = new File(".\\data\\instances\\" + 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 5a94f4124d..35a9668a32 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"), new File("data/instances/").toURI().relativize(f.toURI()).getPath()); + _instanceTemplates.put(parseInteger(attrs, "id"), f.getPath().substring(f.getPath().lastIndexOf("\\instances\\") + 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 c9599f3ea3..06cd49fead 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(Config.DATAPACK_ROOT, "data/instances/" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); + final File xml = new File(".\\data\\instances\\" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();