Jelajahi Sumber

- @pettalk will now fail when muted.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7893 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 tahun lalu
induk
melakukan
9a5e48460c
2 mengubah file dengan 5 tambahan dan 0 penghapusan
  1. 1 0
      Changelog-Trunk.txt
  2. 4 0
      src/map/atcommand.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/07/26
+	* @pettalk will now fail when muted. [Skotlex]
 	* Enabled changing of equipment while stunned/asleep/petrified/etc [Skotlex]
 2006/07/25
 	* Cleaned up run_script_main to properly free previous stack-data when

+ 4 - 0
src/map/atcommand.c

@@ -8205,6 +8205,10 @@ atcommand_pettalk(
 	if(!sd->status.pet_id || !(pd=sd->pd))
 		return -1;
 
+	if (sd->sc.count && //no "chatting" while muted.
+		(sd->sc.data[SC_BERSERK].timer!=-1 || sd->sc.data[SC_NOCHAT].timer != -1))
+		return -1;
+
 	if (sscanf(message, "%99[^\n]", mes) < 1)
 		return -1;