Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Party/guild names can no longer be less then 2 characters long.(bugreport:1328)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12521 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Kevin 2008-04-07 15:10:37 +00:00
parent 255f0fe3fc
commit b316eef727
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/07
* Party/guild names can no longer be less then 2 characters long. (r12521) [Kevin]
2008/04/06 2008/04/06
* Fixed a case where a dangling pointer was formed when a person was * Fixed a case where a dangling pointer was formed when a person was
- invited to a party immediately after creating their own. (r12518) [Kevin] - invited to a party immediately after creating their own. (r12518) [Kevin]

2
src/map/guild.c
View File

@ -402,7 +402,7 @@ int guild_create(struct map_session_data *sd,char *name)
{ {
nullpo_retr(0, sd); nullpo_retr(0, sd);
if(sd->status.guild_id) if(sd->status.guild_id || strlen(name) < 2)
{ {
clif_guild_created(sd,1); // すでに所属している clif_guild_created(sd,1); // すでに所属している
return 0; return 0;

8
src/map/party.c
View File

@ -114,6 +114,12 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
return 0; // "already in a party" return 0; // "already in a party"
} }
if(strlen(name) < 2)
{
clif_party_created(sd, 1);
return 0;
}
//Temporarily set to -1 so cannot be spam invited //Temporarily set to -1 so cannot be spam invited
sd->status.party_id = -1; sd->status.party_id = -1;
@ -132,8 +138,6 @@ void party_created(int account_id,int char_id,int fail,int party_id,char *name)
if (!sd || sd->status.char_id != char_id) if (!sd || sd->status.char_id != char_id)
{ //Character logged off before creation ack? { //Character logged off before creation ack?
if(sd)
sd->status.party_id = 0;
if (!fail) //break up party since player could not be added to it. if (!fail) //break up party since player could not be added to it.
intif_party_leave(party_id,account_id,char_id); intif_party_leave(party_id,account_id,char_id);
return; return;