Commit 432d0233 authored by mercury233's avatar mercury233

fix empty roomname with password VS random

parent 1b7ee273
...@@ -75,6 +75,7 @@ class Room ...@@ -75,6 +75,7 @@ class Room
client_name_and_pass = name.split('$',2) client_name_and_pass = name.split('$',2)
client_name = client_name_and_pass[0] client_name = client_name_and_pass[0]
client_pass = client_name_and_pass[1] client_pass = client_name_and_pass[1]
return true if !client_pass
!_.find Room.all, (room)-> !_.find Room.all, (room)->
room_name_and_pass = room.name.split('$',2) room_name_and_pass = room.name.split('$',2)
room_name = room_name_and_pass[0] room_name = room_name_and_pass[0]
......
...@@ -95,6 +95,9 @@ ...@@ -95,6 +95,9 @@
client_name_and_pass = name.split('$', 2); client_name_and_pass = name.split('$', 2);
client_name = client_name_and_pass[0]; client_name = client_name_and_pass[0];
client_pass = client_name_and_pass[1]; client_pass = client_name_and_pass[1];
if (!client_pass) {
return true;
}
return !_.find(Room.all, function(room) { return !_.find(Room.all, function(room) {
var room_name, room_name_and_pass, room_pass; var room_name, room_name_and_pass, room_pass;
room_name_and_pass = room.name.split('$', 2); room_name_and_pass = room.name.split('$', 2);
......
...@@ -256,7 +256,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -256,7 +256,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
} }
client.end() client.end()
else if !Room.validate(info.pass) else if info.pass.length && !Room.validate(info.pass)
#ygopro.stoc_send client, 'ERROR_MSG',{ #ygopro.stoc_send client, 'ERROR_MSG',{
# msg: 1 # msg: 1
# code: 1 #这返错有问题,直接双ygopro直连怎么都正常,在这里就经常弹不出提示 # code: 1 #这返错有问题,直接双ygopro直连怎么都正常,在这里就经常弹不出提示
......
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
code: 2 code: 2
}); });
client.end(); client.end();
} else if (!Room.validate(info.pass)) { } else if (info.pass.length && !Room.validate(info.pass)) {
ygopro.stoc_send_chat(client, "房间密码不正确", 11); ygopro.stoc_send_chat(client, "房间密码不正确", 11);
ygopro.stoc_send(client, 'ERROR_MSG', { ygopro.stoc_send(client, 'ERROR_MSG', {
msg: 1, msg: 1,
......
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