Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-04 23:32:55 +08:00
Code Issues Projects Releases Wiki Activity

refactor: unwrap redundant code block

Browse Source
This commit is contained in:
Breno A. 2024-06-09 08:58:01 -03:00
parent 029ef823e1
commit 9fa0f2bcad
6 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/command/commands/GroupCommand.java
View File

@ -63,9 +63,7 @@ public final class GroupCommand implements CommandHandler {
CommandHandler.sendMessage(sender, translate(sender, "commands.group.refreshed", groupId));
}
default -> {
sendUsageMessage(sender);
}
default -> sendUsageMessage(sender);
}
}
}

14
src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
View File

@ -106,14 +106,12 @@ public final class SendMailCommand implements CommandHandler {
getConstructionArgs(mailBuilder.constructionStage, sender)));
}
}
case "help" -> {
CommandHandler.sendMessage(
sender,
translate(
sender,
"commands.sendMail.please_use",
getConstructionArgs(mailBuilder.constructionStage, sender)));
}
case "help" -> CommandHandler.sendMessage(
sender,
translate(
sender,
"commands.sendMail.please_use",
getConstructionArgs(mailBuilder.constructionStage, sender)));
default -> {
switch (mailBuilder.constructionStage) {
case 0 -> {

4
src/main/java/emu/grasscutter/command/commands/TalentCommand.java
View File

@ -45,9 +45,7 @@ public final class TalentCommand implements CommandHandler {
String cmdSwitch = args.get(0).toLowerCase();
switch (cmdSwitch) {
default -> {
sendUsageMessage(sender);
}
default -> sendUsageMessage(sender);
case "set" -> {
if (args.size() < 3) {
sendUsageMessage(sender);

38
src/main/java/emu/grasscutter/game/player/PlayerCodex.java
View File

@ -48,16 +48,14 @@ public class PlayerCodex {
val itemData = item.getItemData();
val itemId = item.getItemId();
switch (itemData.getItemType()) {
case ITEM_WEAPON -> {
Optional.ofNullable(GameData.getCodexWeaponDataIdMap().get(itemId))
.ifPresent(
codexData -> {
if (this.getUnlockedWeapon().add(itemId)) {
this.player.save();
this.player.sendPacket(new PacketCodexDataUpdateNotify(2, codexData.getId()));
}
});
}
case ITEM_WEAPON -> Optional.ofNullable(GameData.getCodexWeaponDataIdMap().get(itemId))
.ifPresent(
codexData -> {
if (this.getUnlockedWeapon().add(itemId)) {
this.player.save();
this.player.sendPacket(new PacketCodexDataUpdateNotify(2, codexData.getId()));
}
});
case ITEM_MATERIAL -> {
switch (itemData.getMaterialType()) {
// Is this check even needed?
@ -65,17 +63,15 @@ public class PlayerCodex {
MATERIAL_WIDGET,
MATERIAL_EXCHANGE,
MATERIAL_AVATAR_MATERIAL,
MATERIAL_NOTICE_ADD_HP -> {
Optional.ofNullable(GameData.getCodexMaterialDataIdMap().get(itemId))
.ifPresent(
codexData -> {
if (this.getUnlockedMaterial().add(itemId)) {
this.player.save();
this.player.sendPacket(
new PacketCodexDataUpdateNotify(4, codexData.getId()));
}
});
}
MATERIAL_NOTICE_ADD_HP -> Optional.ofNullable(GameData.getCodexMaterialDataIdMap().get(itemId))
.ifPresent(
codexData -> {
if (this.getUnlockedMaterial().add(itemId)) {
this.player.save();
this.player.sendPacket(
new PacketCodexDataUpdateNotify(4, codexData.getId()));
}
});
default -> {}
}
}

28
src/main/java/emu/grasscutter/server/packet/recv/HandlerTryEnterHomeReq.java
View File

@ -43,24 +43,20 @@ public class HandlerTryEnterHomeReq extends PacketHandler {
}
}
case FriendEnterHomeOptionOuterClass.FriendEnterHomeOption
.FRIEND_ENTER_HOME_OPTION_REFUSE_VALUE -> {
session.send(
new PacketTryEnterHomeRsp(
RetcodeOuterClass.Retcode.RET_HOME_HOME_REFUSE_GUEST_ENTER_VALUE,
req.getTargetUid()));
}
.FRIEND_ENTER_HOME_OPTION_REFUSE_VALUE -> session.send(
new PacketTryEnterHomeRsp(
RetcodeOuterClass.Retcode.RET_HOME_HOME_REFUSE_GUEST_ENTER_VALUE,
req.getTargetUid()));
case FriendEnterHomeOptionOuterClass.FriendEnterHomeOption
.FRIEND_ENTER_HOME_OPTION_DIRECT_VALUE -> {
session
.getServer()
.getHomeWorldMPSystem()
.enterHome(
session.getPlayer(),
targetPlayer,
req.getTargetPoint(),
req.getIsTransferToSafePoint());
}
.FRIEND_ENTER_HOME_OPTION_DIRECT_VALUE -> session
.getServer()
.getHomeWorldMPSystem()
.enterHome(
session.getPlayer(),
targetPlayer,
req.getTargetPoint(),
req.getIsTransferToSafePoint());
}
return;

12
src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
View File

@ -37,9 +37,7 @@ public class PacketVehicleInteractRsp extends BasePacket {
QuestContent.QUEST_CONTENT_ENTER_VEHICLE,
((EntityVehicle) vehicle).getGadgetId());
}
case VEHICLE_INTERACT_TYPE_OUT -> {
((EntityVehicle) vehicle).getVehicleMembers().remove(vehicleMember);
}
case VEHICLE_INTERACT_TYPE_OUT -> ((EntityVehicle) vehicle).getVehicleMembers().remove(vehicleMember);
default -> {}
}
}
@ -57,12 +55,8 @@ public class PacketVehicleInteractRsp extends BasePacket {
proto.setMember(vehicleMember);
switch (interactType) {
case VEHICLE_INTERACT_TYPE_IN -> {
vehicle.getVehicleMembers().add(vehicleMember);
}
case VEHICLE_INTERACT_TYPE_OUT -> {
vehicle.getVehicleMembers().remove(vehicleMember);
}
case VEHICLE_INTERACT_TYPE_IN -> vehicle.getVehicleMembers().add(vehicleMember);
case VEHICLE_INTERACT_TYPE_OUT -> vehicle.getVehicleMembers().remove(vehicleMember);
default -> {}
}
}