Skip to content

S
srvpro
Commit a22baf80 authored by nanahira's avatar nanahira
Browse files
Options

fixmerge

parent e42fcc36
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
ygopro-server.coffee
View file @ a22baf80
...@@ -2094,22 +2094,14 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)-> ...@@ -2094,22 +2094,14 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
return room_title.match(regexp) return room_title.match(regexp)
, room_title) , room_title)
log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip) log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip)
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level2}")
=======
ygopro.stoc_die(client, "${bad_roomname_level2}") ygopro.stoc_die(client, "${bad_roomname_level2}")
>>>>>>> mc
return return
else if _.any(badwords.level1, (badword) -> else if _.any(badwords.level1, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return room_title.match(regexp) return room_title.match(regexp)
, room_title) , room_title)
log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip) log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip)
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level1}")
=======
ygopro.stoc_die(client, "${bad_roomname_level1}") ygopro.stoc_die(client, "${bad_roomname_level1}")
>>>>>>> mc
return return
room = new Room(name, options) room = new Room(name, options)
if room if room
......
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