Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 08:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: HomeModuleManager isnt ticked unless player changes module (#2365)

Browse Source
This commit is contained in:
hamusuke
2023-09-16 09:51:16 +09:00
committed by GitHub
parent c4dbb6851b
commit 5458d36102
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/emu/grasscutter/game/home/HomeModuleManager.java
View File

@@ -59,11 +59,11 @@ public class HomeModuleManager {
}
public void onUpdateArrangement() {
this.fireAllAvatarRewardEvent();
this.cancelSummonEventIfAvatarLeave();
this.fireAllAvatarRewardEvents();
this.cancelSummonEventsIfAvatarLeave();
}
private void fireAllAvatarRewardEvent() {
private void fireAllAvatarRewardEvents() {
this.rewardEvents.clear();
var allBlockItems =
Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
@@ -111,7 +111,7 @@ public class HomeModuleManager {
}
}
private void cancelSummonEventIfAvatarLeave() {
private void cancelSummonEventsIfAvatarLeave() {
var avatars =
Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
.map(HomeSceneItem::getBlockItems)
@@ -225,10 +225,14 @@ public class HomeModuleManager {
this.outdoor.addEntities(this.getOutdoorSceneItem().getAnimals(this.outdoor));
this.indoor.addEntities(this.getIndoorSceneItem().getAnimals(this.indoor));
this.fireAllAvatarRewardEvent();
this.fireAllAvatarRewardEvents();
}
public void onRemovedModule() {
if (this.moduleId == 0) {
return;
}
this.outdoor.getEntities().clear();
this.indoor.getEntities().clear();
}