Merge pull request Grasscutters#1710 from pfyy/development

fix dungeon
GoJam11 · Aug 26, 2022 · 35ddc40 · 35ddc40
2 parents eb42cc9 + c96a190
commit 35ddc40
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java b/src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
@@ -58,7 +58,9 @@ public void setOnSelectWorktopOptionEvent(WorktopWorktopOptionHandler handler) {
         this.handler = handler;
     }
     public boolean onSelectWorktopOption(SelectWorktopOptionReq req) {
-        this.handler.onSelectWorktopOption(this,req.getOptionId());
+        if (this.handler != null) {
+            this.handler.onSelectWorktopOption(this, req.getOptionId());
+        }
         return false;
     }