Merged with released L2J-Unity files.

trunk/java/com/l2jmobius/gameserver/taskmanager/tasks/TaskScript.java

@@ -1,65 +1,51 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.gameserver.taskmanager.tasks;
-
-import java.io.File;
-
-import javax.script.ScriptException;
-
-import com.l2jmobius.gameserver.scripting.L2ScriptEngineManager;
-import com.l2jmobius.gameserver.taskmanager.Task;
-import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask;
-
-/**
- * @author janiii
- */
-public class TaskScript extends Task
-{
-	public static final String NAME = "script";
-	
-	@Override
-	public String getName()
-	{
-		return NAME;
-	}
-	
-	@Override
-	public void onTimeElapsed(ExecutedTask task)
-	{
-		final File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "cron/" + task.getParams()[2]);
-		if (file.isFile())
-		{
-			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]);
-			}
-		}
-		else
-		{
-			_log.warning("File Not Found: " + task.getParams()[2]);
-		}
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.taskmanager.tasks;
+
+import java.nio.file.Paths;
+import java.util.logging.Level;
+
+import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
+import com.l2jmobius.gameserver.taskmanager.Task;
+import com.l2jmobius.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author janiii
+ */
+public class TaskScript extends Task
+{
+	public static final String NAME = "script";
+	
+	@Override
+	public String getName()
+	{
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task)
+	{
+		try
+		{
+			ScriptEngineManager.getInstance().executeScript(Paths.get("cron", task.getParams()[2]));
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Script execution failed!", e);
+		}
+	}
+}