Commit 4c110c08 authored by mercury233's avatar mercury233

fix

parent 3eb58e51
...@@ -58,7 +58,8 @@ class Room ...@@ -58,7 +58,8 @@ class Room
bannedplayer = _.find Room.players_banned, (bannedplayer)-> bannedplayer = _.find Room.players_banned, (bannedplayer)->
ip==bannedplayer.ip ip==bannedplayer.ip
if bannedplayer if bannedplayer
bannedplayer.time=moment(bannedplayer.time).add(Math.pow(2,bannedplayer.count)*30,'s') bantime=Math.pow(2,bannedplayer.count)*30
bannedplayer.time=if moment()<bannedplayer.time then moment(bannedplayer.time).add(bantime,'s') else moment().add(bantime,'s')
bannedplayer.count=bannedplayer.count+1 bannedplayer.count=bannedplayer.count+1
bannedplayer.reason=reason bannedplayer.reason=reason
else else
......
...@@ -68,13 +68,14 @@ ...@@ -68,13 +68,14 @@
Room.players_banned = []; Room.players_banned = [];
Room.ban_player = function(name, ip, reason) { Room.ban_player = function(name, ip, reason) {
var bannedplayer; var bannedplayer, bantime;
log.info("banned", name, ip, reason); log.info("banned", name, ip, reason);
bannedplayer = _.find(Room.players_banned, function(bannedplayer) { bannedplayer = _.find(Room.players_banned, function(bannedplayer) {
return ip === bannedplayer.ip; return ip === bannedplayer.ip;
}); });
if (bannedplayer) { if (bannedplayer) {
bannedplayer.time = moment(bannedplayer.time).add(Math.pow(2, bannedplayer.count) * 30, 's'); bantime = Math.pow(2, bannedplayer.count) * 30;
bannedplayer.time = moment() < bannedplayer.time ? moment(bannedplayer.time).add(bantime, 's') : moment().add(bantime, 's');
bannedplayer.count = bannedplayer.count + 1; bannedplayer.count = bannedplayer.count + 1;
return bannedplayer.reason = reason; return bannedplayer.reason = reason;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment