Merge pull request #8090 from comma/master

Fixes #8009
2026-08-24 04:26:38 +01:00 · 2015-02-09 08:38:50 +01:00
parent 4cab2a2c8e 5496c7bbf0
commit ec1fe5edc7
1 changed files with 2 additions and 1 deletions
@@ -141,9 +141,10 @@
 		if(isliving(src.loc))
 			return
 		user.next_move = max(user.next_move+2,world.time + 2)
-	src.pickup(user)
 	add_fingerprint(user)
 	user.put_in_active_hand(src)
+	if(src.loc == user)
+		src.pickup(user)
 	return