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

Bug fixes (#2314)

Browse Source 
* Match resources names

* Fix loading with no skill

* Stop overriding common command alias

* Fix discord link in version check popup

* Forgot to add rotation fix

* Remove unnecessary set
This commit is contained in:
Thoronium 2023-08-29 10:15:19 -06:00 committed by GitHub
parent 01766a0303
commit f54432a89a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import java.util.List;
@Command(
label = "group",
aliases = {"g"},
aliases = {"gr"},
usage = {"(refresh) [<groupId>] [<suiteId>]"},
permission = "player.group",
permissionTargeted = "player.group.others")

2
src/main/java/emu/grasscutter/command/commands/SoundCommand.java
View File

@ -12,7 +12,7 @@ import lombok.val;
@Command(
label = "sound",
aliases = {"s", "audio"},
aliases = {"audio"},
usage = {"[<audioname>] [<x><y><z>]"},
permission = "player.sound",
permissionTargeted = "player.sound.others")

53
src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java
View File

@ -12,38 +12,38 @@ import lombok.experimental.FieldDefaults;
public class HomeworldDefaultSaveData {
@SerializedName(
value = "KFHBFNPDJBE",
alternate = {"PKACPHDGGEI", "AKOLOBLHDFK"})
value = "homeBlockLists",
alternate = {"PKACPHDGGEI", "AKOLOBLHDFK", "KFHBFNPDJBE"})
List<HomeBlock> homeBlockLists;
@SerializedName(
value = "IJNPADKGNKE",
alternate = {"MINCKHBNING", "MBICDPDEKDM"})
value = "bornPos",
alternate = {"MINCKHBNING", "MBICDPDEKDM", "IJNPADKGNKE"})
Position bornPos;
@SerializedName(
value = "IPIIGEMFLHK",
alternate = {"EJJIOJKFKCO"})
value = "bornRot",
alternate = {"EJJIOJKFKCO", "IPIIGEMFLHK"})
Position bornRot;
@SerializedName(
value = "HHOLBNPIHEM",
alternate = {"CJAKHCIFHNP"})
value = "djinPos",
alternate = {"CJAKHCIFHNP", "HHOLBNPIHEM"})
Position djinPos;
@SerializedName(
value = "KNHCJKHCOAN",
alternate = {"AMDNOHPGKMI"})
value = "mainhouse",
alternate = {"AMDNOHPGKMI", "KNHCJKHCOAN"})
HomeFurniture mainhouse;
@SerializedName(
value = "NIHOJFEKFPG",
alternate = {"BHCPEAOPIDC"})
value = "doorLists",
alternate = {"BHCPEAOPIDC", "NIHOJFEKFPG"})
List<HomeFurniture> doorLists;
@SerializedName(
value = "EPGELGEFJFK",
alternate = {"AABEPENIFLN"})
value = "stairLists",
alternate = {"AABEPENIFLN", "EPGELGEFJFK"})
List<HomeFurniture> stairLists;
@Data
@ -51,18 +51,18 @@ public class HomeworldDefaultSaveData {
public static class HomeBlock {
@SerializedName(
value = "FGIJCELCGFI",
alternate = {"PGDPDIDJEEL", "ANICBLBOBKD"})
value = "blockId",
alternate = {"PGDPDIDJEEL", "ANICBLBOBKD", "FGIJCELCGFI"})
int blockId;
@SerializedName(
value = "BEAPOFELABD",
alternate = {"NCIMIKKFLOH"})
value = "furnitures",
alternate = {"NCIMIKKFLOH", "BEAPOFELABD"})
List<HomeFurniture> furnitures;
@SerializedName(
value = "MLIODLGDFHJ",
alternate = {"GJGNLIINBGB"})
value = "persistentFurnitures",
alternate = {"GJGNLIINBGB", "MLIODLGDFHJ"})
List<HomeFurniture> persistentFurnitures;
}
@ -71,15 +71,18 @@ public class HomeworldDefaultSaveData {
public static class HomeFurniture {
@SerializedName(
value = "ENHNGKJBJAB",
alternate = {"KMAAJJHPNBA", "FFLCGFGGGND"})
value = "id",
alternate = {"KMAAJJHPNBA", "FFLCGFGGGND", "ENHNGKJBJAB"})
int id;
@SerializedName(
value = "NGIEEIOLPPO",
alternate = {"JFKAHNCPDME", "BPCGGBKIAMG"})
value = "pos",
alternate = {"JFKAHNCPDME", "BPCGGBKIAMG", "NGIEEIOLPPO"})
Position pos;
// @SerializedName(value = "HEOCEHKEBFM", alternate = "LKCKOOGFDBM")
@SerializedName(
value = "rot",
alternate = {"LKCKOOGFDBM", "HEOCEHKEBFM"})
Position rot;
}
}

7
src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
View File

@ -157,6 +157,13 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<Avatar>
// Add to avatar storage
this.avatars.put(avatar.getAvatarId(), avatar);
this.avatarsGuid.put(avatar.getGuid(), avatar);
// Set main character skill depot data, fixes loading with no element every login
if ((avatar.getAvatarId() == 10000007) || (avatar.getAvatarId() == 10000005)) {
avatar.setSkillDepot(skillDepot);
avatar.setSkillDepotData(skillDepot);
avatar.save();
}
}
this.setLoaded(true);

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

@ -41,7 +41,7 @@ public class HomeFurnitureItem {
.furnitureId(homeFurniture.getId())
.parentFurnitureIndex(1)
.spawnPos(homeFurniture.getPos() == null ? new Position() : homeFurniture.getPos())
.spawnRot(homeFurniture.getRot() == null ? new Position() : homeFurniture.getRot())
.spawnRot(new Position())
.build();
}

7
src/main/java/emu/grasscutter/game/props/ElementType.java
View File

@ -10,7 +10,10 @@ import java.util.stream.Stream;
import lombok.Getter;
public enum ElementType implements IntValueEnum {
None(0, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
None(
0,
FightProperty.FIGHT_PROP_CUR_WIND_ENERGY,
FightProperty.FIGHT_PROP_MAX_WIND_ENERGY),
Fire(
1,
FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY,
@ -90,7 +93,7 @@ public enum ElementType implements IntValueEnum {
@Getter private final int configHash;
ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp) {
this(value, curEnergyProp, maxEnergyProp, 0, null, 1);
this(value, curEnergyProp, maxEnergyProp, 0, null, 0);
}
ElementType(

2
src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
View File

@ -267,7 +267,7 @@ public final class RegionHandler implements Router {
.setRegionInfo(RegionInfo.newBuilder())
.setStopServer(
StopServerInfo.newBuilder()
.setUrl("https://discord.gg/grasscutters")
.setUrl("https://discord.gg/T5vZU6UyeG")
.setStopBeginTime((int) Instant.now().getEpochSecond())
.setStopEndTime((int) Instant.now().getEpochSecond() + 1)
.setContentMsg(