Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-14 22:34:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor GameAvatar

Browse Source
This commit is contained in:
Melledy
2023-10-16 04:28:28 -07:00
parent 929343f118
commit a8c4b22261
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
View File

@@ -32,6 +32,7 @@ import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
import emu.lunarcore.proto.SpBarInfoOuterClass.SpBarInfo; import emu.lunarcore.proto.SpBarInfoOuterClass.SpBarInfo;
import emu.lunarcore.proto.VectorOuterClass.Vector; import emu.lunarcore.proto.VectorOuterClass.Vector;
import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify; import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify;
import emu.lunarcore.util.Position;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -112,12 +113,22 @@ public class GameAvatar implements GameEntity {
this.owner = player; this.owner = player;
this.ownerUid = player.getUid(); this.ownerUid = player.getUid();
} }
@Override @Override
public void setEntityId(int entityId) { public void setEntityId(int entityId) {
this.entityId = entityId; this.entityId = entityId;
} }
@Override
public Position getPos() {
return this.getOwner().getPos();
}
@Override
public Position getRot() {
return this.getOwner().getRot();
}
public boolean isHero() { public boolean isHero() {
return GameData.getHeroExcelMap().containsKey(this.getAvatarId()); return GameData.getHeroExcelMap().containsKey(this.getAvatarId());
} }
@@ -269,7 +280,7 @@ public class GameAvatar implements GameEntity {
public SceneEntityInfo toSceneEntityProto() { public SceneEntityInfo toSceneEntityProto() {
var proto = SceneEntityInfo.newInstance() var proto = SceneEntityInfo.newInstance()
.setEntityId(this.getEntityId()) .setEntityId(this.getEntityId())
.setMotion(MotionInfo.newInstance().setPos(getOwner().getPos().toProto()).setRot(getOwner().getRot().toProto())) .setMotion(MotionInfo.newInstance().setPos(this.getPos().toProto()).setRot(this.getRot().toProto()))
.setActor(SceneActorInfo.newInstance().setBaseAvatarId(this.getAvatarId()).setAvatarType(AvatarType.AVATAR_FORMAL_TYPE)); .setActor(SceneActorInfo.newInstance().setBaseAvatarId(this.getAvatarId()).setAvatarType(AvatarType.AVATAR_FORMAL_TYPE));
return proto; return proto;

5
src/main/java/emu/lunarcore/game/scene/entity/GameEntity.java
View File

@@ -2,6 +2,7 @@ package emu.lunarcore.game.scene.entity;
import emu.lunarcore.game.scene.Scene; import emu.lunarcore.game.scene.Scene;
import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo; import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
import emu.lunarcore.util.Position;
public interface GameEntity { public interface GameEntity {
@@ -10,6 +11,10 @@ public interface GameEntity {
public void setEntityId(int id); public void setEntityId(int id);
public Scene getScene(); public Scene getScene();
public Position getPos();
public Position getRot();
public default int getGroupId() { public default int getGroupId() {
return 0; return 0;