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

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-09-02 05:48:12 +00:00
parent a49f37edb3
commit 9c25060c78
10 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/emu/grasscutter/game/home/HomeScene.java
View File

@@ -31,12 +31,13 @@ public class HomeScene extends Scene {
}
@Override
public void setPaused(boolean paused) {
}
public void setPaused(boolean paused) {}
@Override
public void onTick() {
this.getEntities().values().forEach(gameEntity -> gameEntity.onTick(this.getSceneTimeSeconds()));
this.getEntities()
.values()
.forEach(gameEntity -> gameEntity.onTick(this.getSceneTimeSeconds()));
this.finishLoading();
this.checkPlayerRespawn();
@@ -44,18 +45,14 @@ public class HomeScene extends Scene {
}
@Override
public void checkNpcGroup() {
}
public void checkNpcGroup() {}
@Override
public void checkSpawns() {
}
public void checkSpawns() {}
@Override
public void addItemEntity(int itemId, int amount, GameEntity bornForm) {
}
public void addItemEntity(int itemId, int amount, GameEntity bornForm) {}
@Override
public void loadNpcForPlayerEnter(Player player) {
}
public void loadNpcForPlayerEnter(Player player) {}
}

23
src/main/java/emu/grasscutter/game/home/HomeSceneItem.java
View File

@@ -9,7 +9,6 @@ import emu.grasscutter.game.entity.EntityHomeAnimal;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.game.world.Scene;
import emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -80,15 +79,19 @@ public class HomeSceneItem {
public List<EntityHomeAnimal> getAnimals(Scene scene) {
return this.blockItems.values().stream()
.map(HomeBlockItem::getDeployAnimalList)
.flatMap(Collection::stream)
.filter(homeAnimalItem -> GameData.getHomeWorldAnimalDataMap().containsKey(homeAnimalItem.getFurnitureId()))
.map(homeAnimalItem -> {
return new EntityHomeAnimal(scene,
GameData.getHomeWorldAnimalDataMap().get(homeAnimalItem.getFurnitureId()),
homeAnimalItem.getSpawnPos());
})
.toList();
.map(HomeBlockItem::getDeployAnimalList)
.flatMap(Collection::stream)
.filter(
homeAnimalItem ->
GameData.getHomeWorldAnimalDataMap().containsKey(homeAnimalItem.getFurnitureId()))
.map(
homeAnimalItem -> {
return new EntityHomeAnimal(
scene,
GameData.getHomeWorldAnimalDataMap().get(homeAnimalItem.getFurnitureId()),
homeAnimalItem.getSpawnPos());
})
.toList();
}
public int calComfort() {

1
src/main/java/emu/grasscutter/game/home/HomeWorld.java
View File

@@ -8,7 +8,6 @@ import emu.grasscutter.game.world.World;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.net.proto.ChatInfoOuterClass;
import emu.grasscutter.server.game.GameServer;
import emu.grasscutter.server.packet.send.*;
import java.util.List;
import lombok.Getter;