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
96caa7db
Unverified
Commit
96caa7db
authored
Aug 31, 2022
by
pfyy
Committed by
GitHub
Aug 31, 2022
Browse files
fix serenitea pot (#1726)
* partial fix of serenitea pot * fix serenitea pot
parent
7dd0c899
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/data/ResourceLoader.java
View file @
96caa7db
...
...
@@ -465,7 +465,7 @@ public class ResourceLoader {
}
try
{
var
sceneId
=
Integer
.
parseInt
(
matcher
.
group
(
1
));
var
data
=
JsonUtils
.
loadToClass
(
file
name
,
HomeworldDefaultSaveData
.
class
);
var
data
=
JsonUtils
.
loadToClass
(
file
.
toString
()
,
HomeworldDefaultSaveData
.
class
);
GameData
.
getHomeworldDefaultSaveData
().
put
(
sceneId
,
data
);
}
catch
(
Exception
ignored
)
{}
});
...
...
@@ -480,7 +480,7 @@ public class ResourceLoader {
return
;
}
try
{
var
data
=
JsonUtils
.
loadToClass
(
file
.
getFileName
().
toString
(),
SceneNpcBornData
.
class
);
var
data
=
JsonUtils
.
loadToClass
(
file
.
toString
(),
SceneNpcBornData
.
class
);
if
(
data
.
getBornPosList
()
==
null
||
data
.
getBornPosList
().
size
()
==
0
)
{
return
;
}
...
...
src/main/java/emu/grasscutter/data/excels/ItemData.java
View file @
96caa7db
...
...
@@ -75,7 +75,7 @@ public class ItemData extends GameResource {
private
int
comfort
;
private
List
<
Integer
>
furnType
;
private
List
<
Integer
>
furnitureGadgetID
;
@SerializedName
(
"JFDLJGDFIGL"
)
@SerializedName
(
value
=
"OHIANNAEEAK"
,
alternate
={
"DANFGGLKLNO"
,
"JFDLJGDFIGL"
}
)
private
int
roomSceneId
;
// Custom
...
...
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