Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-21 19:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-scene'

Browse Source
This commit is contained in:
Melledy
2022-04-19 04:12:53 -07:00
parent 2d2013dfee d9fc159550
commit 06a50365d1
64 changed files with 835 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ public class AvatarStorage implements Iterable<GenshinAvatar> {
entity = new EntityAvatar(avatar);
getPlayer().sendPacket(new PacketAvatarChangeCostumeNotify(entity));
} else {
getPlayer().getWorld().broadcastPacket(new PacketAvatarChangeCostumeNotify(entity));
getPlayer().getScene().broadcastPacket(new PacketAvatarChangeCostumeNotify(entity));
}
// Done

4
src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java
View File

@@ -148,8 +148,8 @@ public class GenshinAvatar {
public void setOwner(GenshinPlayer player) {
this.owner = player;
this.ownerId = player.getId();
this.guid = player.getNextGuid();
this.ownerId = player.getUid();
this.guid = player.getNextGenshinGuid();
}
public int getSatiation() {