summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 15:10:37 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 15:10:37 +0000
commit44f46558e22a2b6c7287a233767bbcb713e25f55 (patch)
tree8a121a2098de6597610aa45923b4bc6c96e852f6 /src/map
parent58862dd12a898cbf75f099a2613ed6540325ce90 (diff)
downloadhercules-44f46558e22a2b6c7287a233767bbcb713e25f55.tar.gz
hercules-44f46558e22a2b6c7287a233767bbcb713e25f55.tar.bz2
hercules-44f46558e22a2b6c7287a233767bbcb713e25f55.tar.xz
hercules-44f46558e22a2b6c7287a233767bbcb713e25f55.zip
Party/guild names can no longer be less then 2 characters long.(bugreport:1328)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12521 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/party.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 8413c5c37..f02deb16c 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -402,7 +402,7 @@ int guild_create(struct map_session_data *sd,char *name)
{
nullpo_retr(0, sd);
- if(sd->status.guild_id)
+ if(sd->status.guild_id || strlen(name) < 2)
{
clif_guild_created(sd,1); // すでに所属している
return 0;
diff --git a/src/map/party.c b/src/map/party.c
index 1d59c476e..e4553036e 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -114,6 +114,12 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
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
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)
{ //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.
intif_party_leave(party_id,account_id,char_id);
return;