Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
0ba13ef7
Commit
0ba13ef7
authored
May 28, 2022
by
Melledy
Browse files
Fix map mark issues from updating from 2.6
Close #1086
parent
7cfa2b6c
Changes
1
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
View file @
0ba13ef7
...
...
@@ -8,13 +8,19 @@ import emu.grasscutter.utils.Position;
@Entity
public
class
MapMark
{
private
final
int
sceneId
;
private
final
String
name
;
private
final
Position
position
;
private
final
MapMarkPointType
pointType
;
private
final
int
monsterId
;
private
final
MapMarkFromType
fromType
;
private
final
int
questId
;
private
int
sceneId
;
private
String
name
;
private
Position
position
;
private
MapMarkPointType
mapMarkPointType
;
private
int
monsterId
;
private
MapMarkFromType
mapMarkFromType
;
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
)
{
this
.
sceneId
=
mapMarkPoint
.
getSceneId
();
...
...
@@ -24,30 +30,36 @@ public class MapMark {
mapMarkPoint
.
getPos
().
getY
(),
mapMarkPoint
.
getPos
().
getZ
()
);
this
.
p
ointType
=
mapMarkPoint
.
getPointType
();
this
.
mapMarkP
ointType
=
mapMarkPoint
.
getPointType
();
this
.
monsterId
=
mapMarkPoint
.
getMonsterId
();
this
.
f
romType
=
mapMarkPoint
.
getFromType
();
this
.
mapMarkF
romType
=
mapMarkPoint
.
getFromType
();
this
.
questId
=
mapMarkPoint
.
getQuestId
();
}
public
int
getSceneId
()
{
return
this
.
sceneId
;
}
public
String
getName
()
{
return
this
.
name
;
}
public
Position
getPosition
()
{
return
this
.
position
;
}
public
MapMarkPointType
getMapMarkPointType
()
{
return
this
.
p
ointType
;
return
this
.
mapMarkP
ointType
;
}
public
int
getMonsterId
()
{
return
this
.
monsterId
;
}
public
MapMarkFromType
getMapMarkFromType
()
{
return
this
.
f
romType
;
return
this
.
mapMarkF
romType
;
}
public
int
getQuestId
()
{
return
this
.
questId
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment