From f89a0b318dc1297c0469d8d8f88f1b45f691959e Mon Sep 17 00:00:00 2001
From: Beny <ben@beny.pro>
Date: Fri, 24 May 2019 12:12:22 +0100
Subject: [PATCH] Fix timers running twice

---
 .../games/InteractionGameTimer.java           | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java
index 6fec1c99..b87bf269 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java
@@ -29,6 +29,7 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
     private int timeNow = 0;
     private boolean isRunning = false;
     private boolean isPaused = false;
+    private boolean threadActive = false;
 
     public InteractionGameTimer(ResultSet set, Item baseItem) throws SQLException
     {
@@ -59,15 +60,20 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
             super.run();
         }
 
-        if(this.getRoomId() == 0)
+        if(this.getRoomId() == 0) {
+            this.threadActive = false;
             return;
+        }
 
         Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId());
 
-        if(room == null || !this.isRunning || this.isPaused)
+        if(room == null || !this.isRunning || this.isPaused) {
+            this.threadActive = false;
             return;
+        }
 
         if(this.timeNow > 0) {
+            this.threadActive = true;
             Emulator.getThreading().run(this, 1000);
             this.timeNow--;
             room.updateItem(this);
@@ -75,6 +81,7 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
         else {
             this.isRunning = false;
             this.isPaused = false;
+            this.threadActive = false;
             endGamesIfLastTimer(room);
         }
     }
@@ -178,7 +185,10 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
             room.updateItem(this);
             WiredHandler.handle(WiredTriggerType.GAME_STARTS, null, room, new Object[] { });
 
-            Emulator.getThreading().run(this);
+            if(!this.threadActive) {
+                this.threadActive = true;
+                Emulator.getThreading().run(this);
+            }
         }
         else if(client != null)
         {
@@ -217,7 +227,11 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
                             this.isRunning = true;
                             timeNow = this.baseTime;
                             room.updateItem(this);
-                            Emulator.getThreading().run(this);
+
+                            if(!this.threadActive) {
+                                this.threadActive = true;
+                                Emulator.getThreading().run(this);
+                            }
                         }
                     }
 
@@ -233,7 +247,11 @@ public abstract class InteractionGameTimer extends HabboItem implements Runnable
                         this.isRunning = true;
                         timeNow = this.baseTime;
                         room.updateItem(this);
-                        Emulator.getThreading().run(this);
+
+                        if(!this.threadActive) {
+                            this.threadActive = true;
+                            Emulator.getThreading().run(this);
+                        }
                     }
                     break;