Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
6e5d9866
Commit
6e5d9866
authored
Sep 03, 2022
by
github-actions
Browse files
Fix whitespace [skip actions]
parent
005a0bce
Changes
24
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/command/CommandMap.java
View file @
6e5d9866
src/main/java/emu/grasscutter/config/ConfigContainer.java
View file @
6e5d9866
src/main/java/emu/grasscutter/data/common/PointData.java
View file @
6e5d9866
src/main/java/emu/grasscutter/data/excels/AvatarCostumeData.java
View file @
6e5d9866
src/main/java/emu/grasscutter/data/excels/EquipAffixData.java
View file @
6e5d9866
src/main/java/emu/grasscutter/data/excels/ItemData.java
View file @
6e5d9866
src/main/java/emu/grasscutter/data/excels/ReliquarySetData.java
View file @
6e5d9866
src/main/java/emu/grasscutter/database/DatabaseHelper.java
View file @
6e5d9866
...
@@ -91,12 +91,12 @@ public final class DatabaseHelper {
...
@@ -91,12 +91,12 @@ public final class DatabaseHelper {
}
}
public
static
Account
getAccountByToken
(
String
token
)
{
public
static
Account
getAccountByToken
(
String
token
)
{
if
(
token
==
null
)
return
null
;
if
(
token
==
null
)
return
null
;
return
DatabaseManager
.
getAccountDatastore
().
find
(
Account
.
class
).
filter
(
Filters
.
eq
(
"token"
,
token
)).
first
();
return
DatabaseManager
.
getAccountDatastore
().
find
(
Account
.
class
).
filter
(
Filters
.
eq
(
"token"
,
token
)).
first
();
}
}
public
static
Account
getAccountBySessionKey
(
String
sessionKey
)
{
public
static
Account
getAccountBySessionKey
(
String
sessionKey
)
{
if
(
sessionKey
==
null
)
return
null
;
if
(
sessionKey
==
null
)
return
null
;
return
DatabaseManager
.
getAccountDatastore
().
find
(
Account
.
class
).
filter
(
Filters
.
eq
(
"sessionKey"
,
sessionKey
)).
first
();
return
DatabaseManager
.
getAccountDatastore
().
find
(
Account
.
class
).
filter
(
Filters
.
eq
(
"sessionKey"
,
sessionKey
)).
first
();
}
}
...
@@ -255,11 +255,11 @@ public final class DatabaseHelper {
...
@@ -255,11 +255,11 @@ public final class DatabaseHelper {
)).
first
();
)).
first
();
}
}
public
static
List
<
GachaRecord
>
getGachaRecords
(
int
ownerId
,
int
page
,
int
gachaType
){
public
static
List
<
GachaRecord
>
getGachaRecords
(
int
ownerId
,
int
page
,
int
gachaType
)
{
return
getGachaRecords
(
ownerId
,
page
,
gachaType
,
10
);
return
getGachaRecords
(
ownerId
,
page
,
gachaType
,
10
);
}
}
public
static
List
<
GachaRecord
>
getGachaRecords
(
int
ownerId
,
int
page
,
int
gachaType
,
int
pageSize
){
public
static
List
<
GachaRecord
>
getGachaRecords
(
int
ownerId
,
int
page
,
int
gachaType
,
int
pageSize
)
{
return
DatabaseManager
.
getGameDatastore
().
find
(
GachaRecord
.
class
).
filter
(
return
DatabaseManager
.
getGameDatastore
().
find
(
GachaRecord
.
class
).
filter
(
Filters
.
eq
(
"ownerId"
,
ownerId
),
Filters
.
eq
(
"ownerId"
,
ownerId
),
Filters
.
eq
(
"gachaType"
,
gachaType
)
Filters
.
eq
(
"gachaType"
,
gachaType
)
...
@@ -270,11 +270,11 @@ public final class DatabaseHelper {
...
@@ -270,11 +270,11 @@ public final class DatabaseHelper {
).
toList
();
).
toList
();
}
}
public
static
long
getGachaRecordsMaxPage
(
int
ownerId
,
int
page
,
int
gachaType
){
public
static
long
getGachaRecordsMaxPage
(
int
ownerId
,
int
page
,
int
gachaType
)
{
return
getGachaRecordsMaxPage
(
ownerId
,
page
,
gachaType
,
10
);
return
getGachaRecordsMaxPage
(
ownerId
,
page
,
gachaType
,
10
);
}
}
public
static
long
getGachaRecordsMaxPage
(
int
ownerId
,
int
page
,
int
gachaType
,
int
pageSize
){
public
static
long
getGachaRecordsMaxPage
(
int
ownerId
,
int
page
,
int
gachaType
,
int
pageSize
)
{
long
count
=
DatabaseManager
.
getGameDatastore
().
find
(
GachaRecord
.
class
).
filter
(
long
count
=
DatabaseManager
.
getGameDatastore
().
find
(
GachaRecord
.
class
).
filter
(
Filters
.
eq
(
"ownerId"
,
ownerId
),
Filters
.
eq
(
"ownerId"
,
ownerId
),
Filters
.
eq
(
"gachaType"
,
gachaType
)
Filters
.
eq
(
"gachaType"
,
gachaType
)
...
@@ -282,7 +282,7 @@ public final class DatabaseHelper {
...
@@ -282,7 +282,7 @@ public final class DatabaseHelper {
return
count
/
10
+
(
count
%
10
>
0
?
1
:
0
);
return
count
/
10
+
(
count
%
10
>
0
?
1
:
0
);
}
}
public
static
void
saveGachaRecord
(
GachaRecord
gachaRecord
){
public
static
void
saveGachaRecord
(
GachaRecord
gachaRecord
)
{
DatabaseManager
.
getGameDatastore
().
save
(
gachaRecord
);
DatabaseManager
.
getGameDatastore
().
save
(
gachaRecord
);
}
}
...
...
src/main/java/emu/grasscutter/game/avatar/Avatar.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherPoint.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/home/HomeBlockItem.java
View file @
6e5d9866
...
@@ -45,7 +45,7 @@ public class HomeBlockItem {
...
@@ -45,7 +45,7 @@ public class HomeBlockItem {
.
toList
();
.
toList
();
}
}
public
int
calComfort
(){
public
int
calComfort
()
{
return
this
.
deployFurnitureList
.
stream
()
return
this
.
deployFurnitureList
.
stream
()
.
mapToInt
(
HomeFurnitureItem:
:
getComfort
)
.
mapToInt
(
HomeFurnitureItem:
:
getComfort
)
.
sum
();
.
sum
();
...
...
src/main/java/emu/grasscutter/game/managers/mapmark/MapMark.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View file @
6e5d9866
src/main/java/emu/grasscutter/game/quest/QuestManager.java
View file @
6e5d9866
src/main/java/emu/grasscutter/server/http/Router.java
View file @
6e5d9866
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
View file @
6e5d9866
...
@@ -20,7 +20,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
...
@@ -20,7 +20,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
var
req
=
MusicGameSettleReqOuterClass
.
MusicGameSettleReq
.
parseFrom
(
payload
);
var
req
=
MusicGameSettleReqOuterClass
.
MusicGameSettleReq
.
parseFrom
(
payload
);
var
playerData
=
session
.
getPlayer
().
getActivityManager
().
getPlayerActivityDataByActivityType
(
ActivityType
.
NEW_ACTIVITY_MUSIC_GAME
);
var
playerData
=
session
.
getPlayer
().
getActivityManager
().
getPlayerActivityDataByActivityType
(
ActivityType
.
NEW_ACTIVITY_MUSIC_GAME
);
if
(
playerData
.
isEmpty
()){
if
(
playerData
.
isEmpty
())
{
return
;
return
;
}
}
var
handler
=
(
MusicGameActivityHandler
)
playerData
.
get
().
getActivityHandler
();
var
handler
=
(
MusicGameActivityHandler
)
playerData
.
get
().
getActivityHandler
();
...
@@ -32,7 +32,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
...
@@ -32,7 +32,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
// Probably was an issue in 2.8 but was discovered in 3.0 port.
// Probably was an issue in 2.8 but was discovered in 3.0 port.
// - Benj
// - Benj
/*if(req.getMusicShareId() == 0){
/*if
(req.getMusicShareId() == 0)
{
session.getPlayer().getActivityManager().triggerWatcher(
session.getPlayer().getActivityManager().triggerWatcher(
WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
String.valueOf(req.getMusicBasicId()),
String.valueOf(req.getMusicBasicId()),
...
@@ -48,7 +48,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
...
@@ -48,7 +48,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
// update activity info
// update activity info
session.send(new PacketActivityInfoNotify(handler.toProto(playerData.get())));
session.send(new PacketActivityInfoNotify(handler.toProto(playerData.get())));
}else{
}else
{
handler.setMusicGameCustomBeatmapRecord(playerData.get(),
handler.setMusicGameCustomBeatmapRecord(playerData.get(),
MusicGamePlayerData.CustomBeatmapRecord.of()
MusicGamePlayerData.CustomBeatmapRecord.of()
.musicShareId(req.getMusicShareId())
.musicShareId(req.getMusicShareId())
...
...
src/main/java/emu/grasscutter/server/packet/recv/HandlerPersonalSceneJumpReq.java
View file @
6e5d9866
src/main/java/emu/grasscutter/server/packet/send/PacketAddCustomTeamRsp.java
View file @
6e5d9866
Prev
1
2
Next
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