Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 05:09:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix map mark issues from updating from 2.6

Browse Source 
Close #1086
This commit is contained in:
Melledy 2022-05-28 22:34:39 -07:00
parent 0453f387ac
commit 73fadfb767
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
View File

@ -8,13 +8,19 @@ import emu.grasscutter.utils.Position;
@Entity @Entity
public class MapMark { public class MapMark {
private final int sceneId; private int sceneId;
private final String name; private String name;
private final Position position; private Position position;
private final MapMarkPointType pointType; private MapMarkPointType mapMarkPointType;
private final int monsterId; private int monsterId;
private final MapMarkFromType fromType; private MapMarkFromType mapMarkFromType;
private final int questId; private int questId;
@Deprecated // Morhpia
public MapMark() {
this.mapMarkPointType = MapMarkPointType.MAP_MARK_POINT_TYPE_MONSTER;
this.mapMarkFromType = MapMarkFromType.MAP_MARK_FROM_TYPE_MONSTER;
}
public MapMark(MapMarkPoint mapMarkPoint) { public MapMark(MapMarkPoint mapMarkPoint) {
this.sceneId = mapMarkPoint.getSceneId(); this.sceneId = mapMarkPoint.getSceneId();
@ -24,30 +30,36 @@ public class MapMark {
mapMarkPoint.getPos().getY(), mapMarkPoint.getPos().getY(),
mapMarkPoint.getPos().getZ() mapMarkPoint.getPos().getZ()
); );
this.pointType = mapMarkPoint.getPointType(); this.mapMarkPointType = mapMarkPoint.getPointType();
this.monsterId = mapMarkPoint.getMonsterId(); this.monsterId = mapMarkPoint.getMonsterId();
this.fromType = mapMarkPoint.getFromType(); this.mapMarkFromType = mapMarkPoint.getFromType();
this.questId = mapMarkPoint.getQuestId(); this.questId = mapMarkPoint.getQuestId();
} }
public int getSceneId() { public int getSceneId() {
return this.sceneId; return this.sceneId;
} }
public String getName() { public String getName() {
return this.name; return this.name;
} }
public Position getPosition() { public Position getPosition() {
return this.position; return this.position;
} }
public MapMarkPointType getMapMarkPointType() { public MapMarkPointType getMapMarkPointType() {
return this.pointType; return this.mapMarkPointType;
} }
public int getMonsterId() { public int getMonsterId() {
return this.monsterId; return this.monsterId;
} }
public MapMarkFromType getMapMarkFromType() { public MapMarkFromType getMapMarkFromType() {
return this.fromType; return this.mapMarkFromType;
} }
public int getQuestId() { public int getQuestId() {
return this.questId; return this.questId;
} }