diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-28 02:20:13 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-28 02:20:13 +0000 |
| commit | d5590087f94f18b2a85980f504b26643eb3f62a1 (patch) | |
| tree | f5f8220ce5fbf0094f47357ce5087137f52e992e | |
| parent | 4c3099bb6c186786858887730b896c6b96415b2a (diff) | |
| download | hercules-d5590087f94f18b2a85980f504b26643eb3f62a1.tar.gz hercules-d5590087f94f18b2a85980f504b26643eb3f62a1.tar.bz2 hercules-d5590087f94f18b2a85980f504b26643eb3f62a1.tar.xz hercules-d5590087f94f18b2a85980f504b26643eb3f62a1.zip | |
* Fixed @accept not checking, whether or not a duel is already full (bugreport:2740, since r4111).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14684 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f113fd3f4..55b78dfea 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/01/27 + * Fixed @accept not checking, whether or not a duel is already full (bugreport:2740, since r4111). [Ai4rei] * Resolving allow/deny IP rules not working (bugreport:2632). [Ai4rei] - Fixed 'mask' being filled with 'ip' when standard mask was specified (since r9647). - Fixed 'ip' and 'mask' (bit mask) being stored in wrong byte order (network order instead of host order) (since r10162). diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 9d069e0c2..dce7441df 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7963,6 +7963,13 @@ ACMD_FUNC(accept) return 0; } + if( duel_list[sd->duel_invite].max_players_limit > 0 && duel_list[sd->duel_invite].members_count >= duel_list[sd->duel_invite].max_players_limit ) + { + // "Duel: Limit of players is reached." + clif_displaymessage(fd, msg_txt(351)); + return 0; + } + duel_accept(sd->duel_invite, sd); // "Duel: Invitation has been accepted." clif_displaymessage(fd, msg_txt(361)); |