Merge branch 'master' into tcg_random

data/pm2-docker-tournament.json

@@ -9,11 +9,6 @@
 			"name": "ygopro-tournament",
 			"script": "/ygopro-server/ygopro-tournament.js",
 			"cwd": "/ygopro-server"
-		},
-		{
-			"name": "redis-server",
-			"script": "/usr/bin/redis-server",
-			"cwd": "/redis"
 		}
 	]
 }

ygopro-server.coffee

@@ -735,7 +735,7 @@ ban_user = global.ban_user = (name) ->
   bans = [dataManager.getBan(name, null)]
   for room in ROOM_all when room and room.established
     for playerType in ["players", "watchers"]
-      for player in room[playerType] when player.name == name or bans.find(ban => player.ip == ban.ip)
+      for player in room[playerType] when player.name == name or bans.find((ban) => player.ip == ban.ip)
         bans.push(dataManager.getBan(name, player.ip))
         ROOM_bad_ip[player.ip]=99
         ygopro.stoc_send_chat_to_room(room, "#{player.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)

ygopro-server.js

@@ -943,9 +943,9 @@
           ref1 = room[playerType];
           for (m = 0, len2 = ref1.length; m < len2; m++) {
             player = ref1[m];
-            if (!(player.name === name || bans.find(ban(() => {
+            if (!(player.name === name || bans.find((ban) => {
               return player.ip === ban.ip;
-            })))) {
+            }))) {
               continue;
             }
             bans.push(dataManager.getBan(name, player.ip));