From 6fed8a8f52af0378eb847fa62a26d0d8e1bb9d4e Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 24 Aug 2021 04:35:09 +0200
Subject: [PATCH] fix null owner (#60928) (#7728)

Co-authored-by: Wayland-Smithy <64715958+Wayland-Smithy@users.noreply.github.com>
---
 code/datums/dash_weapon.dm                     | 5 ++++-
 code/modules/mining/lavaland/megafauna_loot.dm | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index 1f72fb416e9..f601de1def3 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -46,7 +46,10 @@
 
 /datum/action/innate/dash/proc/charge()
 	current_charges = clamp(current_charges + 1, 0, max_charges)
-	owner.update_action_buttons_icon()
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, TRUE)
+
+	if(!owner)
+		return
+	owner.update_action_buttons_icon()
 	dashing_item.balloon_alert(owner, "[current_charges]/[max_charges] dash charges")
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index 07062ac6cb8..8788dbbd104 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -39,10 +39,13 @@
 		club.update_appearance()
 
 	current_charges = clamp(current_charges + 1, 0, max_charges)
-	owner.update_action_buttons_icon()
 
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, TRUE)
+
+	if(!owner)
+		return
+	owner.update_action_buttons_icon()
 	to_chat(owner, span_notice("[src] now has [current_charges]/[max_charges] charges."))
 
 /obj/item/hierophant_club