Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use async.eachSeries #47

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

use async.eachSeries #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ygopro-server.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,13 +664,14 @@ ROOM_ban_player = global.ROOM_ban_player = (name, ip, reason, countadd = 1)->

ROOM_kick = (name, callback)->
found = false
_async.each(ROOM_all, (room, done)->
_async.eachSeries(ROOM_all, (room, done)->
if !(room and room.established and (name == "all" or name == room.process_pid.toString() or name == room.name))
done()
return
found = true
room.terminate()
done()
return
, (err)->
callback(null, found)
return
Expand Down Expand Up @@ -3670,7 +3671,7 @@ if true
response.end(addCallback(u.query.callback, '{"rooms":[{"roomid":"0","roomname":"密码错误","needpass":"true"}]}'))
else
roomsjson = [];
_async.each(ROOM_all, (room, done)->
_async.eachSeries(ROOM_all, (room, done)->
if !(room and room.established)
done()
return
Expand Down Expand Up @@ -3783,7 +3784,7 @@ if true
response.writeHead(200)
response.end(addCallback(u.query.callback, "['密码错误', 0]"))
return
_async.each ROOM_all, (room)->
_async.eachSeries ROOM_all, (room)->
if room and room.established
ygopro.stoc_send_chat_to_room(room, u.query.shout, ygopro.constants.COLORS.YELLOW)
response.writeHead(200)
Expand Down Expand Up @@ -3883,7 +3884,7 @@ if true
response.end(addCallback(u.query.callback, "['密码错误', 0]"))
return
death_room_found = false
_async.each(ROOM_all, (room, done)->
_async.eachSeries(ROOM_all, (room, done)->
if !(room and (u.query.death == "all" or u.query.death == room.process_pid.toString() or u.query.death == room.name))
done()
return
Expand All @@ -3905,13 +3906,14 @@ if true
response.end(addCallback(u.query.callback, "['密码错误', 0]"))
return
death_room_found = false
_async.each(ROOM_all, (room, done)->
_async.eachSeries(ROOM_all, (room, done)->
if !(room and (u.query.deathcancel == "all" or u.query.deathcancel == room.process_pid.toString() or u.query.deathcancel == room.name))
done()
return
if room.cancel_death()
death_room_found = true
done()
return
, () ->
response.writeHead(200)
if death_room_found
Expand Down
14 changes: 7 additions & 7 deletions ygopro-server.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.