From 686757d1894ffd388c7c2074b3640fa490517d01 Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Thu, 26 Sep 2019 18:56:46 +1200
Subject: [PATCH] [AI] refactor

---
 .../org/crandor/game/node/entity/player/ai/AIPlayer.java  | 8 ++------
 .../game/node/entity/player/ai/pvmbots/LowestBot.java     | 3 +--
 .../game/node/entity/player/ai/pvmbots/PvMBots.java       | 2 +-
 09HDscape-server/src/plugin/command/AIPCommandPlugin.java | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
index f7a7fbaeb..1e0ae7abf 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/AIPlayer.java
@@ -181,8 +181,6 @@ public class AIPlayer extends Player {
 	{
 		int meX = this.getLocation().getX();
 		int meY = this.getLocation().getY();
-		//int meX2 = this.getLocation().getX();
-		//System.out.println("local " + meX + " real x? " + meX2 );
 		ArrayList<Node> nodes = new ArrayList<Node>();
 		for (NPC npc : RegionManager.getLocalNpcs(this, range)) {
 			if (npc.getId() == entry)
@@ -399,14 +397,12 @@ public class AIPlayer extends Player {
 	 * @param uid The player's UID.
 	 */
 	public static void deregister(int uid) {
-		if (!botMapping.containsKey(uid)) {
-			System.err.println("Could not deregister AIP#" + uid + ": UID not added to the mapping!");
-			return;
-		}
 		AIPlayer player = botMapping.get(uid);
 		if (player != null) {
 			player.clear();
+			return;
 		}
+		System.err.println("Could not deregister AIP#" + uid + ": UID not added to the mapping!");
 	}
 
 	@Override
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/LowestBot.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/LowestBot.java
index 2fddb1ab9..023aa04ff 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/LowestBot.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/LowestBot.java
@@ -13,8 +13,7 @@ public class LowestBot extends PvMBots{
 	private int tick = 0;
 	
 	@Override
-	public void tick()
-	{
+	public void tick(){
 		super.tick();
 		
 		//Despawn
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBots.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBots.java
index d002db27d..06b83f128 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBots.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBots.java
@@ -74,8 +74,8 @@ public class PvMBots extends AIPlayer {
         if (creatures == null) {
             return false;
         }
-        if (!(creatures.isEmpty())) {
             bot.attack(creatures.get(RandomFunction.getRandom((creatures.size() - 1))));
+        if (!creatures.isEmpty()) {
             return true;
         } else {
             creatures = FindTargets(bot, radius);
diff --git a/09HDscape-server/src/plugin/command/AIPCommandPlugin.java b/09HDscape-server/src/plugin/command/AIPCommandPlugin.java
index 3e882079f..d3e840e26 100644
--- a/09HDscape-server/src/plugin/command/AIPCommandPlugin.java
+++ b/09HDscape-server/src/plugin/command/AIPCommandPlugin.java
@@ -189,7 +189,6 @@ public final class AIPCommandPlugin extends CommandPlugin {
                 PVPAIPActions.syncBotThread(player);
                 return true;
 
-
             case "bot":
                 PvMBotsBuilder.spawnLowest(player.getLocation());
                 return true;