From fb39108c53f66facf1556fd5806367023d9664fd Mon Sep 17 00:00:00 2001
From: AngelRionCervi <a.rioncervi@gmail.com>
Date: Tue, 4 Aug 2020 16:15:01 +0200
Subject: [PATCH] can't kick when election or selection is started

---
 README.md                |  2 +-
 lib/gather/controller.js | 12 ++++++------
 lib/gather/gather.js     | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6f58802..3a0ab2a 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ npm run watch # Compile and watch frontend assets
 
 RANDOM_USER=true npm run dev # Run dev server, loading yourself as a random user
 # or
-Fixed_USER=989 npm run dev # Run dev server, loading yourself as any user with the specified id
+FIXED_USER=989 npm run dev # Run dev server, loading yourself as any user with the specified id
 ```
 
 ## Run in production
diff --git a/lib/gather/controller.js b/lib/gather/controller.js
index d97a518..489f84d 100644
--- a/lib/gather/controller.js
+++ b/lib/gather/controller.js
@@ -25,7 +25,7 @@ const ArchivedGather = mongoose.model("ArchivedGather");
 const Event = mongoose.model("Event");
 const _ = require("lodash");
 const winston = require("winston");
-const kickTimeout = 300 // sec
+const kickTimeout = 600 // sec
 
 module.exports = function (namespace) {
 	const emitGather = (socket, gather) => {
@@ -33,7 +33,7 @@ module.exports = function (namespace) {
 			gather: gather ? gather.toJson() : null,
 			type: gather ? gather.type : null,
 			maps: Map.list,
-		});
+        });
     };
     
     const removeGatherer = (gather, user) => {
@@ -53,10 +53,10 @@ module.exports = function (namespace) {
         refreshGather(gather.type);
     }
 
-    
     const removeAfkGathererTimer = (gather, user) => {
         const interval = setInterval(() => {
-            if (gather.getGatherer(user).user.online) {
+            console.log(gather.current)
+            if (gather.getGatherer(user).user.online || gather.current !== "gathering") {
                 clearInterval(interval);
             }
             const now = Date.now();
@@ -87,7 +87,7 @@ module.exports = function (namespace) {
 		} else {
 			const refresh = gatherRefreshers[type];
 			if (refresh) refresh();
-		}
+        }
 	}
 
 	const updateUserAsOnlineInGather = (userId) => {
@@ -105,7 +105,7 @@ module.exports = function (namespace) {
 			for (var gatherer of gatherManager.current.gatherers) {
 				if (gatherer.user.id == userId && gatherer.user.online) {
 					gatherer.user.online = false;
-					gatherer.user.lastSeen = Date.now();
+                    gatherer.user.lastSeen = Date.now();
                     removeAfkGathererTimer(gatherManager.current, { ...gatherer.user, cooldown: false });
 					refreshGather(type);
 				}
diff --git a/lib/gather/gather.js b/lib/gather/gather.js
index c1fb849..01ce7d6 100644
--- a/lib/gather/gather.js
+++ b/lib/gather/gather.js
@@ -257,20 +257,21 @@ Gather.prototype.modifyGatherer = function (user, callback){
 		.forEach(callback);
 };
 
+// 08/04/20 : 1-1-1-1-1 
 Gather.prototype.getPickingPattern = function () {
-	const pickingPattern = [ // 1-2-2-2-2-2-1
+	const pickingPattern = [ 
 		"marine",
 		"alien",
-		"alien",
-		"marine",
 		"marine",
 		"alien",
-		"alien",
-		"marine",
 		"marine",
 		"alien",
+		"marine",
 		"alien",
 		"marine",
+		"alien",
+		"marine",
+		"alien",
 	];
 	
 	return pickingPattern;