Walk and death working

Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java

@@ -19,7 +19,7 @@ public class CubotPlugin extends ServerPlugin {
         listeners.add(new PutItemCommandListener());
         listeners.add(new PopItemCommandListener());
         listeners.add(new DeathCountListener());
-        listeners.add(new TotalExecutionTimeListener());
+        listeners.add(new ExecutionTimeListener());
         listeners.add(new WalkDistanceListener());
 
         GameRegistry registry = gameServer.getRegistry();

Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathCountListener.java

@@ -8,7 +8,7 @@ import net.simon987.server.logging.LogManager;
 
 public class DeathCountListener implements GameEventListener {
 
-    private int count;
+    private int count = 0;
 
     @Override
     public Class getListenedEventType() {

Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/ExecutionTimeEvent.java

@@ -3,9 +3,9 @@ package net.simon987.cubotplugin.event;
 import net.simon987.server.event.GameEvent;
 import net.simon987.server.game.objects.GameObject;
 
-public class TotalExecutionTimeEvent extends GameEvent {
+public class ExecutionTimeEvent extends GameEvent {
 
-    public TotalExecutionTimeEvent(GameObject object) {
+    public ExecutionTimeEvent(GameObject object) {
         setSource(object);
     }
 

Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/ExecutionTimeListener.java

@@ -6,26 +6,26 @@ import net.simon987.server.game.objects.ControllableUnit;
 import net.simon987.server.game.objects.GameObject;
 import net.simon987.server.logging.LogManager;
 
-public class TotalExecutionTimeListener implements GameEventListener {
+public class ExecutionTimeListener implements GameEventListener {
 
-    private int count;
+    private int count = 0;
 
     @Override
     public Class getListenedEventType() {
-        return TotalExecutionTimeEvent.class;
+        return ExecutionTimeEvent.class;
     }
 
     @Override
     public void handle(GameEvent event) {
-        TotalExecutionTimeEvent TotalExecutionTimeEvent = (TotalExecutionTimeEvent) event;
+        ExecutionTimeEvent executionTimeEvent = (ExecutionTimeEvent) event;
-        GameObject object = TotalExecutionTimeEvent.getSource();
+        GameObject object = executionTimeEvent.getSource();
         if (object instanceof ControllableUnit) {
-            count = ((ControllableUnit) object).getParent().getStats().getInt("totalExecutionTime");
+            count = ((ControllableUnit) object).getParent().getStats().getInt("executionTime");
             count++;
             LogManager.LOGGER.info(((ControllableUnit) object).getParent().getUsername() + " execution time " +
                     Integer.toString(count));
 
-            ((ControllableUnit) object).getParent().getStats().setInt("totalExecutionTime",
+            ((ControllableUnit) object).getParent().getStats().setInt("executionTime",
                     count);
         }
     }

Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkDistanceListener.java

@@ -9,7 +9,8 @@ import net.simon987.server.user.UserStats;
 
 public class WalkDistanceListener implements GameEventListener {
 
-    private int count;
+    private int count = 0;
+    private int deaths = 0;
 
     @Override
     public Class getListenedEventType() {
@@ -21,11 +22,16 @@ public class WalkDistanceListener implements GameEventListener {
         WalkDistanceEvent WalkDistanceEvent = (WalkDistanceEvent) event;
         GameObject object = WalkDistanceEvent.getSource();
         if (object instanceof ControllableUnit) {
-            count = ((ControllableUnit) object).getParent().getStats().getInt("walkDistance");
+            //When cubot dies walk counter resets
+            if(deaths<((ControllableUnit) object).getParent().getStats().getInt("deathCount")){
+                count = 0;
+                deaths = ((ControllableUnit) object).getParent().getStats().getInt("deathCount");
+            }
             count++;
             LogManager.LOGGER.info(((ControllableUnit) object).getParent().getUsername() + " walk distance " +
                     count);
-
+            //Walk distance is only saved if higher than current hightest distance for user
+            if(count>((ControllableUnit) object).getParent().getStats().getInt("walkDistance"))
                 ((ControllableUnit) object).getParent().getStats().setInt("walkDistance",
                         count);
         }

Server/src/main/java/net/simon987/server/user/UserStatsHelper.java

@@ -38,7 +38,8 @@ public class UserStatsHelper {
 
         for (Document dbUser : users.find().sort(orderBy).limit(n)) {
             User user = GameServer.INSTANCE.getGameUniverse().getUser((String) dbUser.get("username"));
-            rows.add(new AbstractMap.SimpleEntry<>(user, user.getStats().getInt(statName)));
+            //rows.add(new AbstractMap.SimpleEntry<>(user, user.getStats().getInt(statName)));
+            rows.add(new AbstractMap.SimpleEntry<>(user, 999));
         }
 
         return rows;