Dropped IGameXmlReader.

ScriptEngineManager class cleanup.
Use of ThreadPool to decrease startup time.
This commit is contained in:
MobiusDevelopment
2019-04-05 04:14:32 +00:00
parent e5fd371ae8
commit eed915b9dc
1036 changed files with 4975 additions and 6228 deletions

View File

@@ -2,11 +2,7 @@
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
<exclude file="package-info.java" />
<exclude file="MasterHandler.java" />
<exclude file="EffectMasterHandler.java" />
<exclude file="SkillConditionMasterHandler.java" />
<exclude file="ConditionMasterHandler.java" />
<exclude file="DailyMissionMasterHandler.java" />
<exclude file="handlers" />
<!--
With this file you can exclude/include specific folders/files from within the scripts directory.

View File

@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.commons.util.IXmlReader;
import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
* Class Master AI.
* @author Nik
*/
public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
public final class ClassMaster extends AbstractNpcAI implements IXmlReader
{
// NPCs
private static final List<Integer> CLASS_MASTERS = new ArrayList<>();

View File

@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
{
sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
}
else if (c.endsWith(".java") || c.endsWith(".py"))
else if (c.endsWith(".java"))
{
sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
{
sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
}
else if (c.endsWith(".java") || c.endsWith(".py"))
else if (c.endsWith(".java"))
{
sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
}

View File

@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
{
try
{
ScriptEngineManager.getInstance().executeEffectMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
}
catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
{
try
{
ScriptEngineManager.getInstance().executeMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
}
catch (Exception e)

View File

@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
{
try
{
ScriptEngineManager.getInstance().executeEffectMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
}
catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
{
try
{
ScriptEngineManager.getInstance().executeMasterHandler();
ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
}
catch (Exception e)