Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
0ba13ef7
Commit
0ba13ef7
authored
3 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Fix map mark issues from updating from 2.6
Close #1086
parent
7cfa2b6c
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
+23
-11
23 additions, 11 deletions
...emu/grasscutter/game/managers/MapMarkManager/MapMark.java
with
23 additions
and
11 deletions
src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java
+
23
−
11
View file @
0ba13ef7
...
@@ -8,13 +8,19 @@ import emu.grasscutter.utils.Position;
...
@@ -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 {
...
@@ -24,30 +30,36 @@ public class MapMark {
mapMarkPoint
.
getPos
().
getY
(),
mapMarkPoint
.
getPos
().
getY
(),
mapMarkPoint
.
getPos
().
getZ
()
mapMarkPoint
.
getPos
().
getZ
()
);
);
this
.
p
ointType
=
mapMarkPoint
.
getPointType
();
this
.
mapMarkP
ointType
=
mapMarkPoint
.
getPointType
();
this
.
monsterId
=
mapMarkPoint
.
getMonsterId
();
this
.
monsterId
=
mapMarkPoint
.
getMonsterId
();
this
.
f
romType
=
mapMarkPoint
.
getFromType
();
this
.
mapMarkF
romType
=
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
.
p
ointType
;
return
this
.
mapMarkP
ointType
;
}
}
public
int
getMonsterId
()
{
public
int
getMonsterId
()
{
return
this
.
monsterId
;
return
this
.
monsterId
;
}
}
public
MapMarkFromType
getMapMarkFromType
()
{
public
MapMarkFromType
getMapMarkFromType
()
{
return
this
.
f
romType
;
return
this
.
mapMarkF
romType
;
}
}
public
int
getQuestId
()
{
public
int
getQuestId
()
{
return
this
.
questId
;
return
this
.
questId
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment