Format code [skip actions]

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

View File

@ -48,7 +48,6 @@ import emu.grasscutter.game.quest.enums.QuestCond;
import emu.grasscutter.game.world.GroupReplacementData; import emu.grasscutter.game.world.GroupReplacementData;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.*; import java.util.*;
import javax.annotation.Nullable; import javax.annotation.Nullable;

View File

@ -13,10 +13,8 @@ import lombok.Getter;
public class EntityHomeAnimal extends EntityMonster implements Rebornable { public class EntityHomeAnimal extends EntityMonster implements Rebornable {
private int rebornCDTickCount; private int rebornCDTickCount;
private final Position rebornPos; private final Position rebornPos;
@Getter @Getter private final int rebirth;
private final int rebirth; @Getter private final int rebirthCD;
@Getter
private final int rebirthCD;
private boolean disappeared; private boolean disappeared;
public EntityHomeAnimal(Scene scene, HomeWorldAnimalData data, Position pos) { public EntityHomeAnimal(Scene scene, HomeWorldAnimalData data, Position pos) {
@ -28,8 +26,7 @@ public class EntityHomeAnimal extends EntityMonster implements Rebornable {
} }
@Override @Override
public void damage(float amount, int killerId, ElementType attackType) { public void damage(float amount, int killerId, ElementType attackType) {}
}
@Override @Override
public void onTick(int sceneTime) { public void onTick(int sceneTime) {
@ -44,8 +41,7 @@ public class EntityHomeAnimal extends EntityMonster implements Rebornable {
} }
@Override @Override
public void onCreate() { public void onCreate() {}
}
@Override @Override
public Position getRebornPos() { public Position getRebornPos() {
@ -59,7 +55,10 @@ public class EntityHomeAnimal extends EntityMonster implements Rebornable {
@Override @Override
public void onAiKillSelf() { public void onAiKillSelf() {
this.getScene().broadcastPacket(new PacketSceneEntityDisappearNotify(this, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE)); this.getScene()
.broadcastPacket(
new PacketSceneEntityDisappearNotify(
this, VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE));
this.rebornCDTickCount = this.getRebornCD(); this.rebornCDTickCount = this.getRebornCD();
this.disappeared = true; this.disappeared = true;
} }

View File

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

View File

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

View File

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

View File

@ -41,7 +41,6 @@ import emu.grasscutter.server.packet.send.*;
import emu.grasscutter.server.scheduler.ServerTaskScheduler; import emu.grasscutter.server.scheduler.ServerTaskScheduler;
import emu.grasscutter.utils.objects.KahnsSort; import emu.grasscutter.utils.objects.KahnsSort;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -466,7 +465,9 @@ public class Scene {
List<GameEntity> entities = List<GameEntity> entities =
this.getEntities().values().stream() this.getEntities().values().stream()
.filter(entity -> entity != currentEntity) .filter(entity -> entity != currentEntity)
.filter(gameEntity -> !(gameEntity instanceof Rebornable rebornable) || !rebornable.isInCD()) .filter(
gameEntity ->
!(gameEntity instanceof Rebornable rebornable) || !rebornable.isInCD())
.toList(); .toList();
player.sendPacket(new PacketSceneEntityAppearNotify(entities, VisionType.VISION_TYPE_MEET)); player.sendPacket(new PacketSceneEntityAppearNotify(entities, VisionType.VISION_TYPE_MEET));

View File

@ -42,7 +42,6 @@ import emu.grasscutter.server.event.types.ServerEvent;
import emu.grasscutter.server.scheduler.ServerTaskScheduler; import emu.grasscutter.server.scheduler.ServerTaskScheduler;
import emu.grasscutter.task.TaskMap; import emu.grasscutter.task.TaskMap;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import java.net.*; import java.net.*;
import java.time.*; import java.time.*;

View File

@ -11,7 +11,8 @@ import emu.grasscutter.server.game.GameSession;
public class HandlerEntityAiKillSelfNotify extends PacketHandler { public class HandlerEntityAiKillSelfNotify extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
var entityId = EntityAiKillSelfNotifyOuterClass.EntityAiKillSelfNotify.parseFrom(payload).getEntityId(); var entityId =
EntityAiKillSelfNotifyOuterClass.EntityAiKillSelfNotify.parseFrom(payload).getEntityId();
if (session.getPlayer().getScene().getEntityById(entityId) instanceof Rebornable rebornable) { if (session.getPlayer().getScene().getEntityById(entityId) instanceof Rebornable rebornable) {
rebornable.onAiKillSelf(); rebornable.onAiKillSelf();
} }

View File

@ -32,7 +32,13 @@ public class HandlerHomeChangeEditModeReq extends PacketHandler {
if (!req.getIsEnterEditMode()) { if (!req.getIsEnterEditMode()) {
var scene = session.getPlayer().getScene(); var scene = session.getPlayer().getScene();
scene.addEntities(session.getPlayer().getCurHomeWorld().getHome().getHomeSceneItem(scene.getId()).getAnimals(scene)); scene.addEntities(
session
.getPlayer()
.getCurHomeWorld()
.getHome()
.getHomeSceneItem(scene.getId())
.getAnimals(scene));
} }
session.send(new PacketHomeChangeEditModeRsp(req.getIsEnterEditMode())); session.send(new PacketHomeChangeEditModeRsp(req.getIsEnterEditMode()));

View File

@ -18,7 +18,11 @@ public class HandlerHomeEnterEditModeFinishReq extends PacketHandler {
*/ */
var scene = session.getPlayer().getScene(); var scene = session.getPlayer().getScene();
scene.removeEntities(scene.getEntities().values().stream().filter(gameEntity -> gameEntity instanceof EntityHomeAnimal).toList(), VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE); scene.removeEntities(
scene.getEntities().values().stream()
.filter(gameEntity -> gameEntity instanceof EntityHomeAnimal)
.toList(),
VisionTypeOuterClass.VisionType.VISION_TYPE_REMOVE);
session.send(new PacketHomeEnterEditModeFinishRsp()); session.send(new PacketHomeEnterEditModeFinishRsp());
} }