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
82398004
Commit
82398004
authored
Aug 11, 2022
by
dragon
Committed by
Luke H-W
Aug 11, 2022
Browse files
make fishhook_tp configurable
parent
46223c89
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/config/ConfigContainer.java
View file @
82398004
...
@@ -191,6 +191,7 @@ public class ConfigContainer {
...
@@ -191,6 +191,7 @@ public class ConfigContainer {
public
boolean
enableShopItems
=
true
;
public
boolean
enableShopItems
=
true
;
public
boolean
staminaUsage
=
true
;
public
boolean
staminaUsage
=
true
;
public
boolean
energyUsage
=
false
;
public
boolean
energyUsage
=
false
;
public
boolean
fishhookTeleport
=
true
;
public
ResinOptions
resinOptions
=
new
ResinOptions
();
public
ResinOptions
resinOptions
=
new
ResinOptions
();
public
Rates
rates
=
new
Rates
();
public
Rates
rates
=
new
Rates
();
...
...
src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
View file @
82398004
package
emu.grasscutter.game.managers.mapmark
;
package
emu.grasscutter.game.managers.mapmark
;
import
emu.grasscutter.config.Configuration
;
import
emu.grasscutter.game.player.BasePlayerManager
;
import
emu.grasscutter.game.player.BasePlayerManager
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType
;
import
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType
;
...
@@ -29,7 +30,7 @@ public class MapMarksManager extends BasePlayerManager {
...
@@ -29,7 +30,7 @@ public class MapMarksManager extends BasePlayerManager {
case
OPERATION_ADD
->
{
case
OPERATION_ADD
->
{
MapMark
createMark
=
new
MapMark
(
req
.
getMark
());
MapMark
createMark
=
new
MapMark
(
req
.
getMark
());
// keep teleporting functionality on fishhook mark.
// 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
);
this
.
teleport
(
player
,
createMark
);
return
;
return
;
}
}
...
...
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