Move AbstractOfflineAction to script implementations package

arianne · Jul 24, 2024 · 6e1a3fc · 6e1a3fc
1 parent 03a1e0d
commit 6e1a3fc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/games/stendhal/server/core/scripting/ScriptRunner.java b/src/games/stendhal/server/core/scripting/ScriptRunner.java
@@ -368,14 +368,8 @@ public int compare(String s1, String s2) {
 		}
 		stringBuilder.append(":");
 
-		final List<String> scriptExcludes = Arrays.asList("AbstractOfflineAction.class");
-
 		for (int i = 0; i < allScripts.size(); i++) {
 			final String scriptName = allScripts.get(i);
-			if (scriptExcludes.contains(scriptName)) {
-				continue;
-			}
-
 			// if arguments given, will look for matches.
 			if (!filterTerm.isEmpty()) {
 				int j = 0;

diff --git a/.../server/script/AbstractOfflineAction.java → ...scripting/impl/AbstractOfflineAction.java b/.../server/script/AbstractOfflineAction.java → ...scripting/impl/AbstractOfflineAction.java
@@ -10,7 +10,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-package games.stendhal.server.script;
+package games.stendhal.server.core.scripting.impl;
 
 import java.sql.Timestamp;
 import java.util.Date;
@@ -20,7 +20,6 @@
 
 import games.stendhal.server.core.engine.StendhalRPRuleProcessor;
 import games.stendhal.server.core.engine.StendhalRPWorld;
-import games.stendhal.server.core.scripting.impl.ScriptImpl;
 import games.stendhal.server.entity.player.Player;
 import marauroa.common.game.IRPZone;
 import marauroa.common.game.RPObject;

diff --git a/src/games/stendhal/server/script/OfflineAdminlevel.java b/src/games/stendhal/server/script/OfflineAdminlevel.java
@@ -1,6 +1,6 @@
 /* $Id$ */
 /***************************************************************************
- *                   (C) Copyright 2003-2010 - Stendhal                    *
+ *                   (C) Copyright 2003-2024 - Stendhal                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -15,6 +15,7 @@
 import java.util.List;
 
 import games.stendhal.server.core.engine.GameEvent;
+import games.stendhal.server.core.scripting.impl.AbstractOfflineAction;
 import games.stendhal.server.entity.player.Player;
 import marauroa.common.game.RPObject;
 

diff --git a/src/games/stendhal/server/script/OfflineClearSentence.java b/src/games/stendhal/server/script/OfflineClearSentence.java
@@ -1,10 +1,19 @@
-/**
- *
- */
+/***************************************************************************
+ *                 Copyright © 2014-2024 - Faiumoni e. V.                  *
+ ***************************************************************************
+ ***************************************************************************
+ *                                                                         *
+ *   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 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 package games.stendhal.server.script;
 
 import java.util.List;
 
+import games.stendhal.server.core.scripting.impl.AbstractOfflineAction;
 import games.stendhal.server.entity.player.Player;
 import marauroa.common.game.RPObject;