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
fbf80e71
Commit
fbf80e71
authored
2 years ago
by
GanyusLeftHorn
Committed by
memetrollsXD
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix crafting for mystic enhancement ores.
parent
5e6a1f39
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/data/excels/ForgeData.java
+5
-0
5 additions, 0 deletions
src/main/java/emu/grasscutter/data/excels/ForgeData.java
src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
+2
-1
2 additions, 1 deletion
...emu/grasscutter/game/managers/forging/ForgingManager.java
with
7 additions
and
1 deletion
src/main/java/emu/grasscutter/data/excels/ForgeData.java
+
5
−
0
View file @
fbf80e71
...
...
@@ -12,6 +12,7 @@ public class ForgeData extends GameResource {
private
int
id
;
private
int
playerLevel
;
private
int
forgeType
;
private
int
showItemId
;
private
int
resultItemId
;
private
int
resultItemCount
;
private
int
forgeTime
;
...
...
@@ -66,6 +67,10 @@ public class ForgeData extends GameResource {
return
materialItems
;
}
public
int
getShowItemId
()
{
return
showItemId
;
}
@Override
public
void
onLoad
()
{
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java
+
2
−
1
View file @
fbf80e71
...
...
@@ -198,8 +198,9 @@ public class ForgingManager {
// Give finished items to the player.
ForgeData
data
=
GameData
.
getForgeDataMap
().
get
(
forge
.
getForgeId
());
ItemData
resultItemData
=
GameData
.
getItemDataMap
().
get
(
data
.
getResultItemId
());
int
resultId
=
data
.
getResultItemId
()
>
0
?
data
.
getResultItemId
()
:
data
.
getShowItemId
();
ItemData
resultItemData
=
GameData
.
getItemDataMap
().
get
(
resultId
);
GameItem
addItem
=
new
GameItem
(
resultItemData
,
data
.
getResultItemCount
()
*
finished
);
this
.
player
.
getInventory
().
addItem
(
addItem
);
...
...
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