Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into dev-quests

Browse Source
This commit is contained in:
Melledy
2022-05-11 03:56:59 -07:00
parent e9d7d5d5f2 e3fd2eaa17
commit 51844b6535
44 changed files with 702 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java
View File

@@ -63,9 +63,10 @@ public final class GiveCharCommand implements CommandHandler {
// Calculate ascension level.
int ascension;
if (level <= 40) {
ascension = (int) Math.ceil(level / 20f);
ascension = (int) Math.ceil(level / 20f) - 1;
} else {
ascension = (int) Math.ceil(level / 10f) - 3;
ascension = Math.min(ascension, 6);
}
Avatar avatar = new Avatar(avatarId);

17
src/main/java/emu/grasscutter/command/commands/LanguageCommand.java
View File

@@ -31,19 +31,26 @@ public final class LanguageCommand implements CommandHandler {
}
String langCode = args.get(0);
String actualLangCode = null;
var languageInst = Grasscutter.getLanguage(langCode);
var actualLangCode = languageInst.getLanguageCode();
var locale = Locale.forLanguageTag(actualLangCode);
if (sender != null) {
var locale = Locale.forLanguageTag(langCode);
actualLangCode = Utils.getLanguageCode(locale);
var account = sender.getAccount();
account.setLocale(locale);
account.save();
}
else {
var languageInst = Grasscutter.getLanguage(langCode);
actualLangCode = languageInst.getLanguageCode();
Grasscutter.setLanguage(languageInst);
var config = Grasscutter.getConfig();
config.language.language = locale;
Grasscutter.saveConfig(config);
}
if (!langCode.equals(actualLangCode)) {
CommandHandler.sendMessage(sender, translate(sender, "commands.language.language_not_found", langCode));
}
CommandHandler.sendMessage(sender, translate(sender, "commands.language.language_changed", actualLangCode));
}