From 9cbca783d64f0a47fe20ec97eca075c87ce0a610 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:07:40 +0000
Subject: [PATCH] English htmls are considered to use the default path.

---
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 .../java/org/l2jmobius/gameserver/cache/HtmCache.java         | 4 ++++
 .../gameserver/model/actor/instance/PlayerInstance.java       | 2 +-
 26 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 31e1871584..98585d2a7c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12804,7 +12804,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 10e0f98c86..8fe6c2ad88 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12811,7 +12811,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index fa8875c3fd..500b289fd0 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12813,7 +12813,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 54c2c73d21..e87e047f69 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12792,7 +12792,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9e9a8565d7..5c802412b9 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12782,7 +12782,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 8a8121ce30..c9b7149432 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12788,7 +12788,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index e63a06ce75..c350f96681 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12794,7 +12794,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 6e58aa193f..8d2012facd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 148711b0ec..7dd81a9162 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -13736,7 +13736,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3b85264fac..3173ffafb1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12646,7 +12646,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 508acdfced..b39f9128be 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12653,7 +12653,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 69b0b9a5dd..63e441949e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12638,7 +12638,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1ee35b1e64..f165f70b5f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12644,7 +12644,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/HtmCache.java
index 08d96bf55d..944a93e77f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/HtmCache.java
@@ -156,6 +156,10 @@ public class HtmCache
 				content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
 			}
 		}
+		if (content == null)
+		{
+			content = HTML_CACHE.get(path);
+		}
 		
 		if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index bc1fab3b5c..988208e7ed 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -12644,7 +12644,7 @@ public final class PlayerInstance extends Playable
 				_lang = Config.MULTILANG_DEFAULT;
 			}
 			
-			_htmlPrefix = "data/lang/" + _lang + "/";
+			_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
 		}
 		else
 		{