Browse Source

* Fixed packet 0x839 (new guild member expel notification) was expected on clients 2010-06-08aRagexeRE~2010-07-30aRagexeRE, although those do not implement it (bugreport:4789, since r14718, related r14368).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14728 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 years ago
parent
commit
57dc2cdfcf
3 changed files with 5 additions and 3 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      db/packet_db.txt
  3. 2 2
      src/map/clif.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 Date	Added
 
 
+2011/03/01
+	* Fixed packet 0x839 (new guild member expel notification) was expected on clients 2010-06-08aRagexeRE~2010-07-30aRagexeRE, although those do not implement it (bugreport:4789, since r14718, related r14368). [Ai4rei]
 2011/02/26
 2011/02/26
 	* Reduced MAX_GUILD_STORAGE from 1000 to 600 (like MAX_STORAGE), since storage with 1000 items causes too large packets that are dropped then, which in turn gives the impression that the items are lost (follow up to r14503). [Ai4rei]
 	* Reduced MAX_GUILD_STORAGE from 1000 to 600 (like MAX_STORAGE), since storage with 1000 items causes too large packets that are dropped then, which in turn gives the impression that the items are lost (follow up to r14503). [Ai4rei]
 	- Note: When updating an existing server, keep in mind that excess items in guild storage get lost, when MAX_GUILD_STORAGE is reduced.
 	- Note: When updating an existing server, keep in mind that excess items in guild storage get lost, when MAX_GUILD_STORAGE is reduced.

+ 1 - 1
db/packet_db.txt

@@ -1548,7 +1548,6 @@ packet_ver: 25
 
 
 //2010-06-08aRagexeRE
 //2010-06-08aRagexeRE
 //0x0838,2
 //0x0838,2
-0x0839,66
 //0x083A,4 	// Search Stalls Feature
 //0x083A,4 	// Search Stalls Feature
 //0x083B,2
 //0x083B,2
 //0x083C,12
 //0x083C,12
@@ -1583,6 +1582,7 @@ packet_ver: 25
 //0x841,4
 //0x841,4
 
 
 //2010-08-03aRagexeRE
 //2010-08-03aRagexeRE
+0x0839,66
 0x0842,6,recall2,2
 0x0842,6,recall2,2
 0x0843,6,remove2,2
 0x0843,6,remove2,2
 
 

+ 2 - 2
src/map/clif.c

@@ -6994,7 +6994,7 @@ int clif_guild_leave(struct map_session_data *sd,const char *name,const char *me
 int clif_guild_expulsion(struct map_session_data *sd,const char *name,const char *mes,int account_id)
 int clif_guild_expulsion(struct map_session_data *sd,const char *name,const char *mes,int account_id)
 {
 {
 	unsigned char buf[128];
 	unsigned char buf[128];
-#if PACKETVER < 20100608
+#if PACKETVER < 20100803
 	const unsigned short cmd = 0x15c;
 	const unsigned short cmd = 0x15c;
 #else
 #else
 	const unsigned short cmd = 0x839;
 	const unsigned short cmd = 0x839;
@@ -7005,7 +7005,7 @@ int clif_guild_expulsion(struct map_session_data *sd,const char *name,const char
 	WBUFW(buf,0) = cmd;
 	WBUFW(buf,0) = cmd;
 	safestrncpy((char*)WBUFP(buf, 2),name,NAME_LENGTH);
 	safestrncpy((char*)WBUFP(buf, 2),name,NAME_LENGTH);
 	safestrncpy((char*)WBUFP(buf,26),mes,40);
 	safestrncpy((char*)WBUFP(buf,26),mes,40);
-#if PACKETVER < 20100608
+#if PACKETVER < 20100803
 	safestrncpy((char*)WBUFP(buf,66),"",NAME_LENGTH); // account name (not used for security reasons)
 	safestrncpy((char*)WBUFP(buf,66),"",NAME_LENGTH); // account name (not used for security reasons)
 #endif
 #endif
 	clif_send(buf,packet_len(cmd),&sd->bl,GUILD_NOBG);
 	clif_send(buf,packet_len(cmd),&sd->bl,GUILD_NOBG);