Don't require admin member to be set in abstract admin script

arianne · May 7, 2024 · 106ee5b · 106ee5b
1 parent abce198
commit 106ee5b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/src/games/stendhal/server/core/scripting/AbstractAdminScript.java b/src/games/stendhal/server/core/scripting/AbstractAdminScript.java
@@ -11,8 +11,6 @@
  ***************************************************************************/
 package games.stendhal.server.core.scripting;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -39,7 +37,7 @@ public abstract class AbstractAdminScript extends ScriptImpl {
 
 	@Override
 	public void execute(final Player admin, final List<String> args) {
-		this.admin = checkNotNull(admin);
+		this.admin = admin;
 		final int minparams = getMinParams();
 		final int maxparams = getMaxParams();
 		if (maxparams > -1 && maxparams < minparams) {
@@ -64,14 +62,33 @@ public void execute(final Player admin, final List<String> args) {
 		run(args);
 	}
 
+	/**
+	 * Sends a private text to admin if set.
+	 *
+	 * @param _type
+	 *   Notification type.
+	 * @param msg
+	 *   Message contents.
+	 */
+	private void sendTextInternal(final NotificationType _type, final String msg) {
+		if (admin == null) {
+			return;
+		}
+		if (_type == null) {
+			admin.sendPrivateText(msg);
+		} else {
+			admin.sendPrivateText(_type, msg);
+		}
+	}
+
 	/**
 	 * Wrapper for sending standard text to admin.
 	 *
 	 * @param msg
 	 *   Message contents.
 	 */
 	protected void sendText(final String msg) {
-		admin.sendPrivateText(msg);
+		sendTextInternal(null, msg);
 	}
 
 	/**
@@ -81,7 +98,7 @@ protected void sendText(final String msg) {
 	 *   Messag contents.
 	 */
 	protected void sendInfo(final String msg) {
-		admin.sendPrivateText(NotificationType.INFORMATION, msg);
+		sendTextInternal(NotificationType.INFORMATION, msg);
 	}
 
 	/**
@@ -91,7 +108,7 @@ protected void sendInfo(final String msg) {
 	 *   Message contents.
 	 */
 	protected void sendWarning(final String msg) {
-		admin.sendPrivateText(NotificationType.WARNING, msg);
+		sendTextInternal(NotificationType.WARNING, msg);
 	}
 
 	/**
@@ -101,7 +118,7 @@ protected void sendWarning(final String msg) {
 	 *   Message contents.
 	 */
 	protected void sendError(final String msg) {
-		admin.sendPrivateText(NotificationType.ERROR, msg);
+		sendTextInternal(NotificationType.ERROR, msg);
 	}
 
 	/**
@@ -130,7 +147,7 @@ private boolean hasHelp() {
 	 * Displays usage information to admin.
 	 */
 	public void showUsage() {
-		admin.sendPrivateText(getUsage());
+		sendTextInternal(null, getUsage());
 	}
 
 	/**

diff --git a/src/games/stendhal/server/script/DebugWeather.java b/src/games/stendhal/server/script/DebugWeather.java
@@ -11,6 +11,8 @@
  ***************************************************************************/
 package games.stendhal.server.script;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -31,6 +33,7 @@ public class DebugWeather extends AbstractAdminScript {
 
 	@Override
 	protected void run(final List<String> args) {
+		checkNotNull(admin);
 		final int argc = args.size();
 		final Set<String> registered = Collections.unmodifiableSet(getTypes());
 		if (registered.size() == 0) {

diff --git a/src/games/stendhal/server/script/ListSpawnPoints.java b/src/games/stendhal/server/script/ListSpawnPoints.java
@@ -11,6 +11,8 @@
  ***************************************************************************/
 package games.stendhal.server.script;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,6 +39,7 @@ public class ListSpawnPoints extends AbstractAdminScript {
 
 	@Override
 	protected void run(final List<String> args) {
+		checkNotNull(admin);
 		final int argc = args.size();
 		String zonename = null;
 		String spawntype = null;

diff --git a/src/games/stendhal/server/script/SpawnCreature.java b/src/games/stendhal/server/script/SpawnCreature.java
@@ -11,6 +11,8 @@
  ***************************************************************************/
 package games.stendhal.server.script;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,6 +31,7 @@ public class SpawnCreature extends AbstractAdminScript {
 
 	@Override
 	protected void run(final List<String> args) {
+		checkNotNull(admin);
 		int x;
 		int y;
 		try {