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
82398004
Commit
82398004
authored
2 years ago
by
dragon
Committed by
Luke H-W
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
make fishhook_tp configurable
parent
46223c89
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/config/ConfigContainer.java
+1
-0
1 addition, 0 deletions
src/main/java/emu/grasscutter/config/ConfigContainer.java
src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
+2
-1
2 additions, 1 deletion
...mu/grasscutter/game/managers/mapmark/MapMarksManager.java
with
3 additions
and
1 deletion
src/main/java/emu/grasscutter/config/ConfigContainer.java
+
1
−
0
View file @
82398004
...
...
@@ -191,6 +191,7 @@ public class ConfigContainer {
public
boolean
enableShopItems
=
true
;
public
boolean
staminaUsage
=
true
;
public
boolean
energyUsage
=
false
;
public
boolean
fishhookTeleport
=
true
;
public
ResinOptions
resinOptions
=
new
ResinOptions
();
public
Rates
rates
=
new
Rates
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
+
2
−
1
View file @
82398004
package
emu.grasscutter.game.managers.mapmark
;
import
emu.grasscutter.config.Configuration
;
import
emu.grasscutter.game.player.BasePlayerManager
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType
;
...
...
@@ -29,7 +30,7 @@ public class MapMarksManager extends BasePlayerManager {
case
OPERATION_ADD
->
{
MapMark
createMark
=
new
MapMark
(
req
.
getMark
());
// keep teleporting functionality on fishhook mark.
if
(
createMark
.
getMapMarkPointType
()
==
MapMarkPointType
.
MAP_MARK_POINT_TYPE_FISH_POOL
)
{
if
(
Configuration
.
GAME_OPTIONS
.
fishhookTeleport
&&
createMark
.
getMapMarkPointType
()
==
MapMarkPointType
.
MAP_MARK_POINT_TYPE_FISH_POOL
)
{
this
.
teleport
(
player
,
createMark
);
return
;
}
...
...
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