Removed java classpath configuration.

L2J_Mobius_1.0_Ertheia/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_2.5_Underground/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_3.0_Helios/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_4.0_GrandCrusade/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_5.0_Salvation/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_5.5_EtinasFate/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_6.0_Fafurion/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}
 	

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/ScriptEngine.ini

@@ -1,14 +1,11 @@
 # ---------------------------------------------------------------------------
 # Script Engine Settings
 # ---------------------------------------------------------------------------
-# Properties retrieved with System.getProperty(String) can be used as values
-# by enclosing the property name with %. Eg.: %java.class.path%
 
 # The parent class loader for isolated script class loaders. 
 # When this property is not specified, has an invalid value or is a class name which could not be found, the System classloader is used.
-# Values: System, ThreadContext or a fully qualified java class name
+# Values: System, ThreadContext or a fully qualified java class name.
 classloader=System
-#classloader=ThreadContext
 
 # Source compatibility.
 source=1.8
@@ -16,8 +13,5 @@ source=1.8
 # The java sourcepath, when you have a different datapack root, you must change this too.
 sourcepath=data/scripts
 
-# The java classpath.
-cp=%java.class.path%
-
 # The debug informations to generate for compiled class files.
 g=source,lines,vars

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java

@@ -51,10 +51,6 @@ public final class JavaExecutionContext extends JavaScriptingEngine
 		// Set options.
 		addOptionIfNotNull(_options, getProperty("source"), "-source");
 		addOptionIfNotNull(_options, getProperty("sourcepath"), "-sourcepath");
-		if (!addOptionIfNotNull(_options, getProperty("cp"), "-cp") && !addOptionIfNotNull(_options, getProperty("classpath"), "-classpath"))
-		{
-			addOptionIfNotNull(_options, System.getProperty("java.class.path"), "-cp");
-		}
 		addOptionIfNotNull(_options, getProperty("g"), "-g:");
 		
 		// We always set the target JVM to the current running version.

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java

@@ -52,15 +52,7 @@ public class JavaScriptingEngine
 		// Set properties.
 		for (Entry<Object, Object> prop : props.entrySet())
 		{
-			String key = (String) prop.getKey();
+			_properties.put((String) prop.getKey(), (String) prop.getValue());
-			String value = (String) prop.getValue();
-			
-			if (value.startsWith("%") && value.endsWith("%"))
-			{
-				value = System.getProperty(value.substring(1, value.length() - 1));
-			}
-			
-			_properties.put(key, value);
 		}
 	}