Skip to content

Commit b8d1a28

Browse files
committed
Replaces lastassailant weakref deletion with setting to null
Fixes bugs caused by the lastassailant weakref getting deleted, which would break any other objects that were using that weakref.
1 parent 85796d8 commit b8d1a28

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

code/__HELPERS/logging.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
if (ismob(target))
9696
target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [what_done] by [user_txt][object_txt].[intent_txt][addition_txt]</font>")
9797
if (!iscarbon(user))
98-
QDEL_NULL(target.lastassailant)
98+
target.lastassailant = null
9999

100100
if (ismob(user) && ismob(target))
101101
target.assaulted_by(user)

code/modules/runescape/runescape_pvp.dm

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,7 @@ var/list/non_standard_maint_areas = list(
5959

6060
/mob/proc/assaulted_by(var/mob/M,var/weak_assault=FALSE)
6161
if(!iscarbon(M))
62-
var/ref_in_use = FALSE
63-
if(istype(src, /mob/living/simple_animal/hostile))
64-
var/mob/living/simple_animal/hostile/H = src
65-
for(var/datum/weakref/friend in H.friends)
66-
if(friend.get() == lastassailant.get())
67-
lastassailant = null
68-
ref_in_use = TRUE
69-
break;
70-
if(!ref_in_use)
71-
QDEL_NULL(lastassailant)
62+
lastassailant = null
7263
else
7364
lastassailant = makeweakref(M)
7465

0 commit comments

Comments
 (0)