Commit 7f6cf59c authored by nanahira's avatar nanahira

update

parent f0570d38
...@@ -1937,7 +1937,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)-> ...@@ -1937,7 +1937,7 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
ygopro.ctos_follow 'HS_TOOBSERVER', true, (buffer, info, client, server)-> ygopro.ctos_follow 'HS_TOOBSERVER', true, (buffer, info, client, server)->
room=ROOM_all[client.rid] room=ROOM_all[client.rid]
return unless room return unless room
if not room.arena or client.is_local if (!room.arena and !settings.modules.challonge.enabled) or client.is_local
return false return false
for player in room.players for player in room.players
if player == client if player == client
...@@ -1950,7 +1950,7 @@ ygopro.ctos_follow 'HS_KICK', true, (buffer, info, client, server)-> ...@@ -1950,7 +1950,7 @@ ygopro.ctos_follow 'HS_KICK', true, (buffer, info, client, server)->
return unless room return unless room
for player in room.players for player in room.players
if player and player.pos == info.pos and player != client if player and player.pos == info.pos and player != client
if room.arena == "athletic" if room.arena == "athletic" or settings.modules.challonge.enabled
ygopro.stoc_send_chat_to_room(room, "#{client.name} ${kicked_by_system}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat_to_room(room, "#{client.name} ${kicked_by_system}", ygopro.constants.COLORS.RED)
CLIENT_kick(client) CLIENT_kick(client)
return true return true
......
...@@ -2356,7 +2356,7 @@ ...@@ -2356,7 +2356,7 @@
if (!room) { if (!room) {
return; return;
} }
if (!room.arena || client.is_local) { if ((!room.arena && !settings.modules.challonge.enabled) || client.is_local) {
return false; return false;
} }
ref2 = room.players; ref2 = room.players;
...@@ -2380,7 +2380,7 @@ ...@@ -2380,7 +2380,7 @@
for (m = 0, len2 = ref2.length; m < len2; m++) { for (m = 0, len2 = ref2.length; m < len2; m++) {
player = ref2[m]; player = ref2[m];
if (player && player.pos === info.pos && player !== client) { if (player && player.pos === info.pos && player !== client) {
if (room.arena === "athletic") { if (room.arena === "athletic" || settings.modules.challonge.enabled) {
ygopro.stoc_send_chat_to_room(room, client.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED); ygopro.stoc_send_chat_to_room(room, client.name + " ${kicked_by_system}", ygopro.constants.COLORS.RED);
CLIENT_kick(client); CLIENT_kick(client);
return true; return true;
......
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