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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
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
MyCard
srvpro
Commits
357cc4b9
Commit
357cc4b9
authored
Feb 05, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix side reconnect error
parent
c2758819
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
ygopro-server.coffee
ygopro-server.coffee
+7
-7
ygopro-server.js
ygopro-server.js
+8
-8
No files found.
ygopro-server.coffee
View file @
357cc4b9
...
...
@@ -2838,6 +2838,12 @@ ygopro.stoc_follow 'DUEL_START', false, (buffer, info, client, server, datas)->
ROOM_players_oppentlist
[
player
.
ip
]
=
null
if
room
.
hostinfo
.
auto_death
ygopro
.
stoc_send_chat_to_room
(
room
,
"${auto_death_part1}
#{
room
.
hostinfo
.
auto_death
}
${auto_death_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
else
if
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
and
client
.
pos
<
4
# side deck verified
client
.
selected_preduel
=
true
if
client
.
side_tcount
clearInterval
client
.
side_interval
client
.
side_interval
=
null
client
.
side_tcount
=
null
if
settings
.
modules
.
hide_name
and
room
.
duel_count
==
0
for
player
in
room
.
get_playing_player
()
when
player
!=
client
ygopro
.
stoc_send
(
client
,
'HS_PLAYER_ENTER'
,
{
...
...
@@ -3102,13 +3108,7 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
buff_side
=
(
info
.
deckbuf
[
i
]
for
i
in
[
info
.
mainc
...
info
.
mainc
+
info
.
sidec
])
client
.
main
=
buff_main
client
.
side
=
buff_side
if
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
client
.
selected_preduel
=
true
if
client
.
side_tcount
clearInterval
client
.
side_interval
client
.
side_interval
=
null
client
.
side_tcount
=
null
else
if
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
client
.
start_deckbuf
=
Buffer
.
from
(
buffer
)
oppo_pos
=
if
room
.
hostinfo
.
mode
==
2
then
2
else
1
if
settings
.
modules
.
http
.
quick_death_rule
>=
2
and
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
death
and
room
.
scores
[
room
.
dueling_players
[
0
].
name_vpass
]
!=
room
.
scores
[
room
.
dueling_players
[
oppo_pos
].
name_vpass
]
...
...
ygopro-server.js
View file @
357cc4b9
...
...
@@ -3601,6 +3601,13 @@
if
(
room
.
hostinfo
.
auto_death
)
{
ygopro
.
stoc_send_chat_to_room
(
room
,
"
${auto_death_part1}
"
+
room
.
hostinfo
.
auto_death
+
"
${auto_death_part2}
"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
}
}
else
if
(
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
&&
client
.
pos
<
4
)
{
client
.
selected_preduel
=
true
;
if
(
client
.
side_tcount
)
{
clearInterval
(
client
.
side_interval
);
client
.
side_interval
=
null
;
client
.
side_tcount
=
null
;
}
}
if
(
settings
.
modules
.
hide_name
&&
room
.
duel_count
===
0
)
{
ref3
=
room
.
get_playing_player
();
...
...
@@ -3960,14 +3967,7 @@
})();
client
.
main
=
buff_main
;
client
.
side
=
buff_side
;
if
(
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
)
{
client
.
selected_preduel
=
true
;
if
(
client
.
side_tcount
)
{
clearInterval
(
client
.
side_interval
);
client
.
side_interval
=
null
;
client
.
side_tcount
=
null
;
}
}
else
{
if
(
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
)
{
client
.
start_deckbuf
=
Buffer
.
from
(
buffer
);
}
oppo_pos
=
room
.
hostinfo
.
mode
===
2
?
2
:
1
;
...
...
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