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
2ef86ad4
Commit
2ef86ad4
authored
Jan 24, 2019
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
6c605bb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
ygopro-server.coffee
ygopro-server.coffee
+6
-8
ygopro-server.js
ygopro-server.js
+7
-9
No files found.
ygopro-server.coffee
View file @
2ef86ad4
...
@@ -3289,13 +3289,13 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
...
@@ -3289,13 +3289,13 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
CLIENT_kick
(
room
.
dueling_players
[
oppo_pos
-
win_pos
])
CLIENT_kick
(
room
.
dueling_players
[
oppo_pos
-
win_pos
])
CLIENT_kick
(
room
.
dueling_players
[
oppo_pos
-
win_pos
+
1
])
if
room
.
hostinfo
.
mode
==
2
CLIENT_kick
(
room
.
dueling_players
[
oppo_pos
-
win_pos
+
1
])
if
room
.
hostinfo
.
mode
==
2
return
true
return
true
struct
=
ygopro
.
structs
[
"deck"
]
struct
.
_setBuff
(
buffer
)
if
room
.
random_type
or
room
.
arena
if
room
.
random_type
or
room
.
arena
if
client
.
pos
==
0
if
client
.
pos
==
0
room
.
waiting_for_player
=
room
.
waiting_for_player2
room
.
waiting_for_player
=
room
.
waiting_for_player2
room
.
last_active_time
=
moment
()
room
.
last_active_time
=
moment
()
else
if
!
room
.
started
and
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
deck_check
and
fs
.
readdirSync
(
settings
.
modules
.
tournament_mode
.
deck_path
).
length
else
if
!
room
.
started
and
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
deck_check
and
fs
.
readdirSync
(
settings
.
modules
.
tournament_mode
.
deck_path
).
length
struct
=
ygopro
.
structs
[
"deck"
]
struct
.
_setBuff
(
buffer
)
struct
.
set
(
"mainc"
,
1
)
struct
.
set
(
"mainc"
,
1
)
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"sidec"
,
1
)
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
struct
.
set
(
"deckbuf"
,
[
4392470
,
4392470
])
...
@@ -3352,13 +3352,11 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
...
@@ -3352,13 +3352,11 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
found
=
true
found
=
true
buff_side_new
.
push
(
code_
)
buff_side_new
.
push
(
code_
)
if
found
if
found
compat_struct
=
ygopro
.
structs
[
"deck"
]
compat_struct
.
_setBuff
(
buffer
)
compat_deckbuf
=
buff_main_new
.
concat
(
buff_side_new
)
compat_deckbuf
=
buff_main_new
.
concat
(
buff_side_new
)
compat_
struct
.
set
(
"mainc"
,
buff_main_new
.
length
)
struct
.
set
(
"mainc"
,
buff_main_new
.
length
)
compat_
struct
.
set
(
"sidec"
,
buff_side_new
.
length
)
struct
.
set
(
"sidec"
,
buff_side_new
.
length
)
compat_
struct
.
set
(
"deckbuf"
,
compat_deckbuf
)
struct
.
set
(
"deckbuf"
,
compat_deckbuf
)
buffer
=
compat_
struct
.
buffer
buffer
=
struct
.
buffer
client
.
main
=
buff_main_new
client
.
main
=
buff_main_new
client
.
side
=
buff_side_new
client
.
side
=
buff_side_new
if
!
room
.
started
if
!
room
.
started
...
...
ygopro-server.js
View file @
2ef86ad4
...
@@ -4141,7 +4141,7 @@
...
@@ -4141,7 +4141,7 @@
});
});
ygopro
.
ctos_follow
(
'
UPDATE_DECK
'
,
true
,
function
(
buffer
,
info
,
client
,
server
,
datas
)
{
ygopro
.
ctos_follow
(
'
UPDATE_DECK
'
,
true
,
function
(
buffer
,
info
,
client
,
server
,
datas
)
{
var
buff_main
,
buff_main_new
,
buff_side
,
buff_side_new
,
card
,
code
,
code_
,
compat_deckbuf
,
c
ompat_struct
,
c
urrent_deck
,
deck
,
deck_array
,
deck_main
,
deck_side
,
deck_text
,
deckbuf
,
decks
,
found
,
found_deck
,
i
,
len3
,
len4
,
len5
,
len6
,
line
,
m
,
n
,
o
,
oppo_pos
,
p
,
room
,
struct
,
win_pos
;
var
buff_main
,
buff_main_new
,
buff_side
,
buff_side_new
,
card
,
code
,
code_
,
compat_deckbuf
,
current_deck
,
deck
,
deck_array
,
deck_main
,
deck_side
,
deck_text
,
deckbuf
,
decks
,
found
,
found_deck
,
i
,
len3
,
len4
,
len5
,
len6
,
line
,
m
,
n
,
o
,
oppo_pos
,
p
,
room
,
struct
,
win_pos
;
if
(
settings
.
modules
.
reconnect
.
enabled
&&
client
.
pre_reconnecting
)
{
if
(
settings
.
modules
.
reconnect
.
enabled
&&
client
.
pre_reconnecting
)
{
if
(
!
CLIENT_is_able_to_reconnect
(
client
)
&&
!
CLIENT_is_able_to_kick_reconnect
(
client
))
{
if
(
!
CLIENT_is_able_to_reconnect
(
client
)
&&
!
CLIENT_is_able_to_kick_reconnect
(
client
))
{
ygopro
.
stoc_send_chat
(
client
,
"
${reconnect_failed}
"
,
ygopro
.
constants
.
COLORS
.
RED
);
ygopro
.
stoc_send_chat
(
client
,
"
${reconnect_failed}
"
,
ygopro
.
constants
.
COLORS
.
RED
);
...
@@ -4217,14 +4217,14 @@
...
@@ -4217,14 +4217,14 @@
}
}
return
true
;
return
true
;
}
}
struct
=
ygopro
.
structs
[
"
deck
"
];
struct
.
_setBuff
(
buffer
);
if
(
room
.
random_type
||
room
.
arena
)
{
if
(
room
.
random_type
||
room
.
arena
)
{
if
(
client
.
pos
===
0
)
{
if
(
client
.
pos
===
0
)
{
room
.
waiting_for_player
=
room
.
waiting_for_player2
;
room
.
waiting_for_player
=
room
.
waiting_for_player2
;
}
}
room
.
last_active_time
=
moment
();
room
.
last_active_time
=
moment
();
}
else
if
(
!
room
.
started
&&
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
deck_check
&&
fs
.
readdirSync
(
settings
.
modules
.
tournament_mode
.
deck_path
).
length
)
{
}
else
if
(
!
room
.
started
&&
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
deck_check
&&
fs
.
readdirSync
(
settings
.
modules
.
tournament_mode
.
deck_path
).
length
)
{
struct
=
ygopro
.
structs
[
"
deck
"
];
struct
.
_setBuff
(
buffer
);
struct
.
set
(
"
mainc
"
,
1
);
struct
.
set
(
"
mainc
"
,
1
);
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
sidec
"
,
1
);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
struct
.
set
(
"
deckbuf
"
,
[
4392470
,
4392470
]);
...
@@ -4297,13 +4297,11 @@
...
@@ -4297,13 +4297,11 @@
buff_side_new
.
push
(
code_
);
buff_side_new
.
push
(
code_
);
}
}
if
(
found
)
{
if
(
found
)
{
compat_struct
=
ygopro
.
structs
[
"
deck
"
];
compat_struct
.
_setBuff
(
buffer
);
compat_deckbuf
=
buff_main_new
.
concat
(
buff_side_new
);
compat_deckbuf
=
buff_main_new
.
concat
(
buff_side_new
);
compat_
struct
.
set
(
"
mainc
"
,
buff_main_new
.
length
);
struct
.
set
(
"
mainc
"
,
buff_main_new
.
length
);
compat_
struct
.
set
(
"
sidec
"
,
buff_side_new
.
length
);
struct
.
set
(
"
sidec
"
,
buff_side_new
.
length
);
compat_
struct
.
set
(
"
deckbuf
"
,
compat_deckbuf
);
struct
.
set
(
"
deckbuf
"
,
compat_deckbuf
);
buffer
=
compat_
struct
.
buffer
;
buffer
=
struct
.
buffer
;
client
.
main
=
buff_main_new
;
client
.
main
=
buff_main_new
;
client
.
side
=
buff_side_new
;
client
.
side
=
buff_side_new
;
}
}
...
...
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