summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/party.c8
3 files changed, 9 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index eeafac7c4..e874a5203 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
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.
+2008/04/07
+ * Party/guild names can no longer be less then 2 characters long. (r12521) [Kevin]
2008/04/06
* Fixed a case where a dangling pointer was formed when a person was
- invited to a party immediately after creating their own. (r12518) [Kevin]
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;