Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
srvpro
Commits
6ab4630a
Commit
6ab4630a
authored
Jul 08, 2019
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "test fix to leaving room"
This reverts commit
7099842b
.
parent
9680fea7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
ygopro-server.coffee
ygopro-server.coffee
+2
-3
ygopro-server.js
ygopro-server.js
+2
-3
No files found.
ygopro-server.coffee
View file @
6ab4630a
...
...
@@ -1364,7 +1364,8 @@ class Room
@
arena_score_handled
=
true
index
=
_
.
indexOf
(
@
players
,
client
)
@
players
.
splice
(
index
,
1
)
unless
index
==
-
1
if
@
started
and
!
@
finished
and
@
disconnector
!=
'server'
and
client
.
pos
<
4
and
!
client
.
system_kicked
if
@
started
and
@
disconnector
!=
'server'
and
client
.
pos
<
4
@
finished
=
true
if
!
@
finished_by_death
@
scores
[
client
.
name_vpass
]
=
-
9
if
@
random_type
and
not
client
.
flee_free
and
(
!
settings
.
modules
.
reconnect
.
enabled
or
@
get_disconnected_count
()
==
0
)
...
...
@@ -2383,7 +2384,6 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
delete
room
.
long_resolve_card
delete
room
.
long_resolve_chain
if
room
and
!
room
.
finished
and
room
.
dueling_players
[
pos
]
room
.
finished
=
true
room
.
winner_name
=
room
.
dueling_players
[
pos
].
name_vpass
#log.info room.dueling_players, pos
room
.
scores
[
room
.
winner_name
]
=
room
.
scores
[
room
.
winner_name
]
+
1
...
...
@@ -3209,7 +3209,6 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server, datas)->
room
=
ROOM_all
[
client
.
rid
]
return
unless
room
room
.
changing_side
=
true
room
.
finished
=
false
client
.
selected_preduel
=
false
if
settings
.
modules
.
side_timeout
client
.
side_tcount
=
settings
.
modules
.
side_timeout
...
...
ygopro-server.js
View file @
6ab4630a
...
...
@@ -1779,7 +1779,8 @@
if
(
index
!==
-
1
)
{
this
.
players
.
splice
(
index
,
1
);
}
if
(
this
.
started
&&
!
this
.
finished
&&
this
.
disconnector
!==
'
server
'
&&
client
.
pos
<
4
&&
!
client
.
system_kicked
)
{
if
(
this
.
started
&&
this
.
disconnector
!==
'
server
'
&&
client
.
pos
<
4
)
{
this
.
finished
=
true
;
if
(
!
this
.
finished_by_death
)
{
this
.
scores
[
client
.
name_vpass
]
=
-
9
;
if
(
this
.
random_type
&&
!
client
.
flee_free
&&
(
!
settings
.
modules
.
reconnect
.
enabled
||
this
.
get_disconnected_count
()
===
0
))
{
...
...
@@ -2940,7 +2941,6 @@
delete
room
.
long_resolve_chain
;
}
if
(
room
&&
!
room
.
finished
&&
room
.
dueling_players
[
pos
])
{
room
.
finished
=
true
;
room
.
winner_name
=
room
.
dueling_players
[
pos
].
name_vpass
;
room
.
scores
[
room
.
winner_name
]
=
room
.
scores
[
room
.
winner_name
]
+
1
;
if
(
room
.
match_kill
)
{
...
...
@@ -4114,7 +4114,6 @@
return
;
}
room
.
changing_side
=
true
;
room
.
finished
=
false
;
client
.
selected_preduel
=
false
;
if
(
settings
.
modules
.
side_timeout
)
{
client
.
side_tcount
=
settings
.
modules
.
side_timeout
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment