lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In case localisation does not exist try the default path.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-07-12 11:19:29 +00:00
parent 9cbca783d6
commit ca0f25e532
13 changed files with 65 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@ -146,7 +146,7 @@ public class HtmCache
public String getHtm(PlayerInstance player, String path) public String getHtm(PlayerInstance player, String path)
{ {
final String prefix = player != null ? player.getHtmlPrefix() : ""; final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path; String newPath = prefix + path;
String content = HTML_CACHE.get(newPath); String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null)) if (Config.LAZY_CACHE && (content == null))
{ {
@ -156,9 +156,12 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath)); content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
} }
} }
if (content == null)
// In case localisation does not exist try the default path.
if ((content == null) && !prefix.contentEquals(""))
{ {
content = HTML_CACHE.get(path); content = HTML_CACHE.get(path);
newPath = path;
} }
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)