Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-11 12:43:07 +08:00
Code Issues Projects Releases Wiki Activity

Fix invalid gadget info for worktops

Browse Source
This commit is contained in:
KingRainbow44 2023-04-29 14:07:22 -04:00
parent 404ff9233a
commit 76251c6718
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/emu/grasscutter/game/entity/gadget/GadgetWorktop.java
View File

@ -1,5 +1,6 @@
package emu.grasscutter.game.entity.gadget; package emu.grasscutter.game.entity.gadget;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.entity.EntityGadget; import emu.grasscutter.game.entity.EntityGadget;
import emu.grasscutter.game.entity.gadget.worktop.WorktopWorktopOptionHandler; import emu.grasscutter.game.entity.gadget.worktop.WorktopWorktopOptionHandler;
import emu.grasscutter.game.player.Player; import emu.grasscutter.game.player.Player;
@ -10,6 +11,7 @@ import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet; import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSet;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
public final class GadgetWorktop extends GadgetContent { public final class GadgetWorktop extends GadgetContent {
private IntSet worktopOptions; private IntSet worktopOptions;
@ -45,14 +47,19 @@ public final class GadgetWorktop extends GadgetContent {
} }
public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) { public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
if (this.worktopOptions == null) { var options = this.getWorktopOptions();
return; if (options == null) return;
try {
var worktop = WorktopInfo.newBuilder()
.addAllOptionList(options).build();
gadgetInfo.setWorktop(worktop);
} catch (NullPointerException ignored) {
// "this.wrapped" is null.
gadgetInfo.setWorktop(WorktopInfo.newBuilder()
.addAllOptionList(Collections.emptyList()).build());
Grasscutter.getLogger().warn("GadgetWorktop.onBuildProto: this.wrapped is null");
} }
WorktopInfo worktop =
WorktopInfo.newBuilder().addAllOptionList(this.getWorktopOptions()).build();
gadgetInfo.setWorktop(worktop);
} }
public void setOnSelectWorktopOptionEvent(WorktopWorktopOptionHandler handler) { public void setOnSelectWorktopOptionEvent(WorktopWorktopOptionHandler handler) {