Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity

two small activity/event fixes

Browse Source 
* fixed GetAcitivityInfoReq proto
* added draft to gadget Scene gatget, to let the client know the propper minigame for some entities
This commit is contained in:
hartie95 2022-07-25 03:04:40 +02:00 committed by Luke H-W
parent 59a412cc83
commit 938b54c2ee
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,7 @@ 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.getContent() != null) { if (this.getContent() != null) {

1
src/main/java/emu/grasscutter/scripts/data/SceneGadget.java
View File

@ -12,6 +12,7 @@ public class SceneGadget extends SceneObject{
public SceneBossChest boss_chest; public SceneBossChest boss_chest;
public int interact_id; public int interact_id;
public boolean isOneoff; public boolean isOneoff;
public int draft_id;
public void setIsOneoff(boolean isOneoff){ public void setIsOneoff(boolean isOneoff){
this.isOneoff = isOneoff; this.isOneoff = isOneoff;