From 938b54c2ee0768f0bcb46fd4a67371cf9c23067a Mon Sep 17 00:00:00 2001 From: hartie95 Date: Mon, 25 Jul 2022 03:04:40 +0200 Subject: [PATCH] two small activity/event fixes * fixed GetAcitivityInfoReq proto * added draft to gadget Scene gatget, to let the client know the propper minigame for some entities --- src/main/java/emu/grasscutter/game/entity/EntityGadget.java | 1 + src/main/java/emu/grasscutter/scripts/data/SceneGadget.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java index 1f88f451a..f74a79e7b 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java @@ -219,6 +219,7 @@ public class EntityGadget extends EntityBaseGadget { .setConfigId(this.getConfigId()) .setGadgetState(this.getState()) .setIsEnableInteract(true) + .setDraftId(this.metaGadget.draft_id) .setAuthorityPeerId(this.getScene().getWorld().getHostPeerId()); if (this.getContent() != null) { diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java b/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java index afbe7d0d5..0b0174472 100644 --- a/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java +++ b/src/main/java/emu/grasscutter/scripts/data/SceneGadget.java @@ -12,6 +12,7 @@ public class SceneGadget extends SceneObject{ public SceneBossChest boss_chest; public int interact_id; public boolean isOneoff; + public int draft_id; public void setIsOneoff(boolean isOneoff){ this.isOneoff = isOneoff;