Project cleanup pre merge.

2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -20,92 +20,91 @@ import org.pmw.tinylog.Logger;

 /**
 * @author Eighty
- *
 */
 public class AddMobCmd extends AbstractDevCmd {

-	public AddMobCmd() {
+    public AddMobCmd() {
        super("mob");
    }

-	@Override
-	protected void _doCmd(PlayerCharacter pc, String[] words,
-			AbstractGameObject target) {
-		if (words.length != 1) {
-			this.sendUsage(pc);
-			return;
-		}
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        if (words.length != 1) {
+            this.sendUsage(pc);
+            return;
+        }

-		Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
+        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());

-		if (words[0].equals("all")){
+        if (words[0].equals("all")) {

-			for (AbstractGameObject mobbaseAGO: DbManager.getList(GameObjectType.MobBase)){
-				MobBase mb = (MobBase)mobbaseAGO;
-				int loadID = mb.getObjectUUID();
-				Mob mob = Mob.createMob( loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-						null, true, zone, null,0, "", 1);
-				if (mob != null) {
-					mob.updateDatabase();
-					this.setResult(String.valueOf(mob.getDBID()));
-				} else {
-					throwbackError(pc, "Failed to create mob of type " + loadID);
-					Logger.error( "Failed to create mob of type "
-							+ loadID);
-				}
-			}
-			return;
-		}
+            for (AbstractGameObject mobbaseAGO : DbManager.getList(GameObjectType.MobBase)) {
+                MobBase mb = (MobBase) mobbaseAGO;
+                int loadID = mb.getObjectUUID();
+                Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
+                        null, true, zone, null, 0, "", 1);
+                if (mob != null) {
+                    mob.updateDatabase();
+                    this.setResult(String.valueOf(mob.getDBID()));
+                } else {
+                    throwbackError(pc, "Failed to create mob of type " + loadID);
+                    Logger.error("Failed to create mob of type "
+                            + loadID);
+                }
+            }
+            return;
+        }


-		int loadID;
-		try {
-			loadID = Integer.parseInt(words[0]);
-		} catch (NumberFormatException e) {
-			throwbackError(pc, "Supplied type " + words[0]
-					+ " failed to parse to an Integer");
-			return;
-		} catch (Exception e) {
-			throwbackError(pc,
-					"An unknown exception occurred when trying to use mob command for type "
-							+ words[0]);
-			return; // NaN
-		}
+        int loadID;
+        try {
+            loadID = Integer.parseInt(words[0]);
+        } catch (NumberFormatException e) {
+            throwbackError(pc, "Supplied type " + words[0]
+                    + " failed to parse to an Integer");
+            return;
+        } catch (Exception e) {
+            throwbackError(pc,
+                    "An unknown exception occurred when trying to use mob command for type "
+                            + words[0]);
+            return; // NaN
+        }


-		if (zone == null) {
-			throwbackError(pc, "Failed to find zone to place mob in.");
-			return;
-		}
+        if (zone == null) {
+            throwbackError(pc, "Failed to find zone to place mob in.");
+            return;
+        }

-		if (zone.isPlayerCity()) {
-			throwbackError(pc, "Cannot use ./mob on Player cities. Try ./servermob instead.");
-			return;
-		}
+        if (zone.isPlayerCity()) {
+            throwbackError(pc, "Cannot use ./mob on Player cities. Try ./servermob instead.");
+            return;
+        }


-		Mob mob = Mob.createMob( loadID, pc.getLoc(),
-				null, true, zone, null,0, "", 1);
-		if (mob != null) {
-			mob.updateDatabase();
-			ChatManager.chatSayInfo(pc,
-					"Mob with ID " + mob.getDBID() + " added");
-			this.setResult(String.valueOf(mob.getDBID()));
-		} else {
-			throwbackError(pc, "Failed to create mob of type " + loadID);
-			Logger.error("Failed to create mob of type "
-					+ loadID);
-		}
-	}
+        Mob mob = Mob.createMob(loadID, pc.getLoc(),
+                null, true, zone, null, 0, "", 1);
+        if (mob != null) {
+            mob.updateDatabase();
+            ChatManager.chatSayInfo(pc,
+                    "Mob with ID " + mob.getDBID() + " added");
+            this.setResult(String.valueOf(mob.getDBID()));
+        } else {
+            throwbackError(pc, "Failed to create mob of type " + loadID);
+            Logger.error("Failed to create mob of type "
+                    + loadID);
+        }
+    }

-	@Override
-	protected String _getHelpString() {
+    @Override
+    protected String _getHelpString() {
        return "Creates a Mob of type 'mobID' at the location your character is standing";
-	}
+    }

-	@Override
-	protected String _getUsageString() {
+    @Override
+    protected String _getUsageString() {
        return "' /mob mobID'";
-	}
+    }

 }