From c108d3e987d6d5fe486c3e8250ce5e3af421accf Mon Sep 17 00:00:00 2001
From: Nikita Iryupin <iryupnik@fel.cvut.cz>
Date: Tue, 3 Mar 2020 21:25:56 +0100
Subject: [PATCH] Revert "Fix NullPointerException"

This reverts commit 9ee498cb07837a1fa8049c6ea950a77eb3d9d76a
---
 src/main/java/WindowOfFreeMove.java | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/WindowOfFreeMove.java b/src/main/java/WindowOfFreeMove.java
index c1622ee..34a3e0a 100644
--- a/src/main/java/WindowOfFreeMove.java
+++ b/src/main/java/WindowOfFreeMove.java
@@ -12,7 +12,6 @@ public class WindowOfFreeMove extends JFrame {
 
     private static boolean canPersonMove;
     private static boolean preventDoubleMove;
-    private static boolean isReadyToPaint;
 
     static final int KEY_LEFT = 37;
     static final int KEY_UP = 38;
@@ -50,7 +49,6 @@ public class WindowOfFreeMove extends JFrame {
     }
 
     public WindowOfFreeMove() {
-        isReadyToPaint = false;
         canPersonMove = true;
         preventDoubleMove = true;
         lp = getLayeredPane();
@@ -133,7 +131,6 @@ public class WindowOfFreeMove extends JFrame {
 
         setMap(m1);
         map.createMap();
-        isReadyToPaint = true;
 //
 //        lp.remove(dialogBar);
 //
@@ -159,7 +156,7 @@ public class WindowOfFreeMove extends JFrame {
         //setCanPersonMove(false);
 //        lp.add(jf, JLayeredPane.POPUP_LAYER);
 
-        timer = new Timer( 16, new ActionListener() {
+        timer = new Timer(5, new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent actionEvent) {
                 if (!map.getPerson().getIsMoving()) {
@@ -174,18 +171,16 @@ public class WindowOfFreeMove extends JFrame {
     static class Canvas extends JPanel {
         @Override
         public void paint(Graphics g) {
-            if (isReadyToPaint) {
-                super.paint(g);
-                Graphics2D g2D = (Graphics2D) g;
-                g2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                        RenderingHints.VALUE_ANTIALIAS_ON);
-                for (Cell cell : map.getMoveToCells()) {
-                    cell.paint(g2D);
-                }
-                map.getPerson().paint(g2D);
-                for (Cell cell : map.getBlocks()) {
-                    cell.paint(g2D);
-                }
+            super.paint(g);
+            Graphics2D g2D = (Graphics2D) g;
+            g2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_ON);
+            for (Cell cell : map.getBlocks()) {
+                cell.paint(g2D);
+            }
+            map.getPerson().paint(g2D);
+            for (Cell cell : map.getMoveToCells()) {
+                cell.paint(g2D);
             }
         }
     }