Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-03-13 04:47:18 +08:00
Code Issues Projects Releases Wiki Activity

Validate EntityAvatar scene before invoking

Browse Source
This commit is contained in:
KingRainbow44 2023-04-29 20:39:57 -04:00
parent dd2d1dc7e2
commit 9bbdc11334
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
View File

@ -1,6 +1,7 @@
package emu.grasscutter.game.entity;
import emu.grasscutter.GameConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.excels.avatar.AvatarData;
import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData;
@ -55,11 +56,17 @@ public class EntityAvatar extends GameEntity {
this.avatar = avatar;
this.avatar.setCurrentEnergy();
if (scene != null) this.id = getScene().getWorld().getNextEntityId(EntityIdType.AVATAR);
GameItem weapon = this.getAvatar().getWeapon();
if (weapon != null) {
weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
if (scene != null) {
var world = scene.getWorld();
this.id = world.getNextEntityId(EntityIdType.AVATAR);
var weapon = this.getAvatar().getWeapon();
if (weapon != null) {
weapon.setWeaponEntityId(world.getNextEntityId(EntityIdType.WEAPON));
}
} else {
Grasscutter.getLogger().error("Unable to create EntityAvatar instance; provided scene is null.");
}
}