Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-02-21 09:57:22 +08:00
parent 8856c1501a bcffa931b9
commit 7c0a63f729
27 changed files with 277 additions and 104 deletions
@@ -665,7 +665,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 				create_message(U, locate(href_list["target"]))

 			if("MessageAll")
-				send_to_all(U)
+				if(cartridge?.spam_enabled)
+					send_to_all(U)

 			if("toggle_block")
 				toggle_blocking(usr, href_list["target"])