Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Fixing fishing. (Skyrat-SS13#29033)
Browse files Browse the repository at this point in the history
* [NO GBP] Fixing fishing. (#85200)

## About The Pull Request
Fuck. We need to delete the line BEFORE `hook_hit` and not after.

## Why It's Good For The Game
This PR will fix #85198.

## Changelog

:cl:
fix: Fixed fishing.
/:cl:

* [NO GBP] Fixing fishing.

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
  • Loading branch information
SkyratBot and Ghommie committed Jul 24, 2024
1 parent e4d67a4 commit 678d78a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/modules/fishing/fishing_rod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -591,19 +591,18 @@
/obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
if(blocked < 100)
QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish.
owner.hook_hit(target)
qdel(src)

/obj/projectile/fishing_cast/fire(angle, atom/direct_target)
. = ..()
our_line = owner.create_fishing_line(src)

/obj/projectile/fishing_cast/Destroy()
. = ..()
QDEL_NULL(our_line)
owner?.casting = FALSE


owner = null
return ..()

/datum/beam/fishing_line
// Is the fishing rod held in left side hand
Expand Down

0 comments on commit 678d78a

Please sign in to comment.