Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-14 16:04:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix an NPE in EntityGadget when draft_id isn't set

Browse Source 
Merge pull request #1579 from Hartie95/nullfix
This commit is contained in:
Magix
2022-07-26 12:14:08 -04:00
committed by GitHub
parent 107111d3fc 964e73f0f6
commit 9781d5e6c9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@@ -219,9 +219,12 @@ public class EntityGadget extends EntityBaseGadget {
.setConfigId(this.getConfigId()) .setConfigId(this.getConfigId())
.setGadgetState(this.getState()) .setGadgetState(this.getState())
.setIsEnableInteract(true) .setIsEnableInteract(true)
.setDraftId(this.metaGadget.draft_id)
.setAuthorityPeerId(this.getScene().getWorld().getHostPeerId()); .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
if(this.metaGadget != null) {
gadgetInfo.setDraftId(this.metaGadget.draft_id);
}
if (this.getContent() != null) { if (this.getContent() != null) {
this.getContent().onBuildProto(gadgetInfo); this.getContent().onBuildProto(gadgetInfo);
} }