Code style

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

@@ -1,5 +1,7 @@
 package net.simon987.cubotplugin;
 
+import net.simon987.cubotplugin.event.CubotWalkEvent;
+import net.simon987.cubotplugin.event.DeathEvent;
 import net.simon987.server.GameServer;
 import net.simon987.server.IServerConfiguration;
 import net.simon987.server.assembly.CPU;
@@ -7,12 +9,11 @@ import net.simon987.server.assembly.HardwareModule;
 import net.simon987.server.assembly.Memory;
 import net.simon987.server.assembly.Status;
 import net.simon987.server.assembly.exception.CancelledException;
+import net.simon987.server.event.GameEvent;
 import net.simon987.server.game.item.Item;
 import net.simon987.server.game.item.ItemVoid;
 import net.simon987.server.game.objects.*;
 import net.simon987.server.user.User;
-import net.simon987.server.event.GameEvent;
-import net.simon987.cubotplugin.event.*;
 import org.bson.Document;
 import org.json.simple.JSONObject;
 
@@ -154,9 +155,6 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
         return MAP_INFO;
     }
 
-    /**
-     * Called every tick
-     */
     @Override
     public void update() {
         if (currentAction == Action.WALKING) {
@@ -165,8 +163,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
                     //Couldn't walk
                     currentAction = Action.IDLE;
                 }else{
-                    GameEvent event2 = new WalkEvent(this);
+                    GameServer.INSTANCE.getEventDispatcher().dispatch(new CubotWalkEvent(this));
-                    GameServer.INSTANCE.getEventDispatcher().dispatch(event2);
                 }
             } else {
                 currentAction = Action.IDLE;

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

@@ -0,0 +1,17 @@
+package net.simon987.cubotplugin.event;
+
+import net.simon987.cubotplugin.Cubot;
+import net.simon987.server.event.GameEvent;
+
+public class CubotWalkEvent extends GameEvent {
+
+    public CubotWalkEvent(Cubot cubot) {
+        setSource(cubot);
+    }
+
+    @Override
+    public Cubot getSource() {
+        return (Cubot) super.getSource();
+    }
+
+}

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

@@ -4,7 +4,6 @@ import net.simon987.server.event.GameEvent;
 import net.simon987.server.event.GameEventListener;
 import net.simon987.server.game.objects.ControllableUnit;
 import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.logging.LogManager;
 
 public class DeathListener implements GameEventListener {
 
@@ -18,8 +17,7 @@ public class DeathListener implements GameEventListener {
         DeathEvent DeathEvent = (DeathEvent) event;
         GameObject object = DeathEvent.getSource();
         if (object instanceof ControllableUnit) {
-            ((ControllableUnit) object).getParent().getStats().incrementStat("death",
+            ((ControllableUnit) object).getParent().getStats().incrementStat("death", 1);
-                    1);
         }
     }
 }

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

@@ -1,17 +0,0 @@
-package net.simon987.cubotplugin.event;
-
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.game.objects.GameObject;
-
-public class WalkEvent extends GameEvent {
-
-    public WalkEvent(GameObject object) {
-        setSource(object);
-    }
-
-    @Override
-    public GameObject getSource() {
-        return (GameObject) super.getSource();
-    }
-
-}

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

@@ -2,25 +2,17 @@ package net.simon987.cubotplugin.event;
 
 import net.simon987.server.event.GameEvent;
 import net.simon987.server.event.GameEventListener;
-import net.simon987.server.game.objects.ControllableUnit;
-import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.UserStats;
 
 public class WalkListener implements GameEventListener {
 
     @Override
     public Class getListenedEventType() {
-        return WalkEvent.class;
+        return CubotWalkEvent.class;
     }
 
     @Override
     public void handle(GameEvent event) {
-        WalkEvent WalkEvent = (WalkEvent) event;
+        CubotWalkEvent walkEvent = (CubotWalkEvent) event;
-        GameObject object = WalkEvent.getSource();
+        walkEvent.getSource().getParent().getStats().incrementStat("walkDistance", 1);
-        if (object instanceof ControllableUnit) {
-            ((ControllableUnit) object).getParent().getStats().incrementStat("walkDistance",
-                    1);
-        }
     }
 }