Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages 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
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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(