mark self thief state

Author: Symb1OS

bdofishbot-bot/src/main/java/ru/namibios/bdofishbot/bot/state/PersonalMessageState.java

@@ -47,9 +47,9 @@ else if (Application.getInstance().PM_EXIT_GAME()) {
 
 				fishBot.setPmDetected(true);
 			}
-			
-			fishBot.setState(new CheckEquipState(fishBot));
-		
+
+			fishBot.setState(new SelfThiefState(fishBot));
+
 		} catch (Exception e) {
 			LOG.info(String.format(Message.LOG_FORMAT_ERROR, e));
 			LOG.error(ExceptionUtils.getString(e));

bdofishbot-bot/src/main/java/ru/namibios/bdofishbot/bot/state/SelfThiefState.java

@@ -0,0 +1,43 @@
+package ru.namibios.bdofishbot.bot.state;
+
+import org.apache.log4j.Logger;
+import ru.namibios.bdofishbot.bot.command.Mark;
+import ru.namibios.bdofishbot.bot.command.ShortCommand;
+import ru.namibios.bdofishbot.cli.Application;
+import ru.namibios.bdofishbot.cli.config.Message;
+import ru.namibios.bdofishbot.utils.ExceptionUtils;
+
+public class SelfThiefState extends State {
+
+    private static final Logger LOG = Logger.getLogger(SelfThiefState.class);
+
+    public SelfThiefState(FishBot fishBot) {
+        super(fishBot);
+
+        this.beforeStart = Application.getInstance().DELAY_SELF_THIEF_BEFORE();
+        this.afterStart = Application.getInstance().DELAY_SELF_THIEF_AFTER();
+    }
+
+    @Override
+    public void onStep() {
+
+        try{
+
+            if (Application.getInstance().MARK_SELT_THIEF()) {
+                LOG.info("Check mark self thief");
+                Mark mark = new Mark();
+                if (mark.getKey().isEmpty()) {
+                    inputService.send(ShortCommand.MARK);
+                }
+            }
+
+        } catch (Exception e) {
+            LOG.info(String.format(Message.LOG_FORMAT_ERROR, e));
+            LOG.error(ExceptionUtils.getString(e));
+        }
+
+        fishBot.setState(new CheckEquipState(fishBot));
+
+    }
+
+}

bdofishbot-bot/src/main/java/ru/namibios/bdofishbot/bot/state/StartFishState.java

@@ -2,7 +2,6 @@
 
 import org.apache.log4j.Logger;
 import ru.namibios.bdofishbot.bot.command.Calendar;
-import ru.namibios.bdofishbot.bot.command.Mark;
 import ru.namibios.bdofishbot.bot.command.ShortCommand;
 import ru.namibios.bdofishbot.bot.service.PauseService;
 import ru.namibios.bdofishbot.cli.Application;
@@ -29,13 +28,6 @@ public void onStep() {
 
 		try {
 
-			if (Application.getInstance().MARK_SELT_THIEF()) {
-				Mark mark = new Mark();
-				if (mark.getKey().isEmpty()) {
-					inputService.send(ShortCommand.MARK);
-				}
-			}
-
 			if (pauseService.isReady()) {
 				pauseService.rest();
 			}

bdofishbot-bot/src/main/java/ru/namibios/bdofishbot/cli/config/ApplicationConfig.java

@@ -368,6 +368,14 @@ public interface ApplicationConfig extends Accessible, Mutable{
 	@DefaultValue("0")
 	int DELAY_AFTER_FILTER_LOOT();
 
+	@Key("bot.delay.self_thief.before")
+	@DefaultValue("0")
+	long DELAY_SELF_THIEF_BEFORE();
+
+	@Key("bot.delay.self_thief.after")
+	@DefaultValue("0")
+	long DELAY_SELF_THIEF_AFTER();
+
 
 	///////////////////////////////////////////////////////////////////////////
 	// NOTIFICATION

pom.xml

@@ -16,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>3.2.9</revision>
+        <revision>3.2.10</revision>
     </properties>
 
     <dependencies>