Fix an NPE in EntityGadget when draft_id isn't set

Merge pull request Grasscutters#1579 from Hartie95/nullfix
GoJam11 · Jul 26, 2022 · 9781d5e · 9781d5e
2 parents 107111d + 964e73f
commit 9781d5e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java
@@ -219,9 +219,12 @@ public SceneEntityInfo toProto() {
                 .setConfigId(this.getConfigId())
                 .setGadgetState(this.getState())
                 .setIsEnableInteract(true)
-                .setDraftId(this.metaGadget.draft_id)
                 .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
 
+        if(this.metaGadget != null) {
+            gadgetInfo.setDraftId(this.metaGadget.draft_id);
+        }
+
         if (this.getContent() != null) {
             this.getContent().onBuildProto(gadgetInfo);
         }