Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-03-12 01:47:45 +08:00
Code Issues Projects Releases Wiki Activity

make fishhook_tp configurable

Browse Source
This commit is contained in:
dragon 2022-08-11 19:33:18 +08:00 committed by Luke H-W
parent 46223c8976
commit 823980046e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/emu/grasscutter/config/ConfigContainer.java
View File

@ -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();

3
src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
View File

@ -1,5 +1,6 @@
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 {
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;
} }