Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-02 21:53:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix whitespace [skip actions]

Browse Source
This commit is contained in:
github-actions 2022-09-03 03:36:51 +00:00
parent 005a0bce96
commit 6e5d986687
24 changed files with 510 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/database/DatabaseHelper.java
View File

@ -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 {
)).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 {
).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 {
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);
} }

2
src/main/java/emu/grasscutter/game/home/HomeBlockItem.java
View File

@ -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();

6
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
View File

@ -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 {
// 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 {
// 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())