Commit 82398004 authored by dragon's avatar dragon Committed by Luke H-W
Browse files

make fishhook_tp configurable

parent 46223c89
...@@ -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();
......
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;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment