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

Synced ScriptEngineManager changes from Test to HighFive.

Browse Source
This commit is contained in:
MobiusDev
2016-10-21 22:06:56 +00:00
parent 34fc592ced
commit 42019a897a
70 changed files with 1695 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/taskmanager/tasks/TaskScript.java
View File

@ -16,11 +16,10 @@
*/
package com.l2jmobius.gameserver.taskmanager.tasks;
import java.io.File;
import java.nio.file.Paths;
import java.util.logging.Level;
import javax.script.ScriptException;
import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
import com.l2jmobius.gameserver.taskmanager.Task;
import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask;
@ -40,26 +39,13 @@ public class TaskScript extends Task
@Override
public void onTimeElapsed(ExecutedTask task)
{
final File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "cron/" + task.getParams()[2]);
if (file.isFile())
try
{
try
{
L2ScriptEngineManager.getInstance().executeScript(file);
}
catch (ScriptException e)
{
_log.warning("Failed loading: " + task.getParams()[2]);
L2ScriptEngineManager.getInstance().reportScriptFileError(file, e);
}
catch (Exception e)
{
_log.warning("Failed loading: " + task.getParams()[2]);
}
ScriptEngineManager.getInstance().executeScript(Paths.get("cron", task.getParams()[2]));
}
else
catch (Exception e)
{
_log.warning("File Not Found: " + task.getParams()[2]);
_log.log(Level.WARNING, "Script execution failed!", e);
}
}
}