From 57dc2cdfcf03d8701e49ec8ddd89c66a0766bf2d Mon Sep 17 00:00:00 2001 From: ai4rei Date: Tue, 1 Mar 2011 22:24:18 +0000 Subject: [PATCH] * 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 --- Changelog-Trunk.txt | 2 ++ db/packet_db.txt | 2 +- src/map/clif.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 28a9dfe548..e65c95a51f 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ 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 * 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. diff --git a/db/packet_db.txt b/db/packet_db.txt index 7f86ed3feb..358e7d19a8 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1548,7 +1548,6 @@ packet_ver: 25 //2010-06-08aRagexeRE //0x0838,2 -0x0839,66 //0x083A,4 // Search Stalls Feature //0x083B,2 //0x083C,12 @@ -1583,6 +1582,7 @@ packet_ver: 25 //0x841,4 //2010-08-03aRagexeRE +0x0839,66 0x0842,6,recall2,2 0x0843,6,remove2,2 diff --git a/src/map/clif.c b/src/map/clif.c index d405ee81cd..0c7dc16b21 100644 --- a/src/map/clif.c +++ b/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) { unsigned char buf[128]; -#if PACKETVER < 20100608 +#if PACKETVER < 20100803 const unsigned short cmd = 0x15c; #else 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; safestrncpy((char*)WBUFP(buf, 2),name,NAME_LENGTH); 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) #endif clif_send(buf,packet_len(cmd),&sd->bl,GUILD_NOBG);