diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 17:30:17 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 17:30:17 +0000 |
| commit | 23425a017a8e0e6254c0a3e4ed6ca9de47523e76 (patch) | |
| tree | 78b92890a1f654e51a29e8083dca70d4d284aa76 | |
| parent | 2e8889919d6444b608dee8b745a9d8b8dc893f31 (diff) | |
| download | hercules-23425a017a8e0e6254c0a3e4ed6ca9de47523e76.tar.gz hercules-23425a017a8e0e6254c0a3e4ed6ca9de47523e76.tar.bz2 hercules-23425a017a8e0e6254c0a3e4ed6ca9de47523e76.tar.xz hercules-23425a017a8e0e6254c0a3e4ed6ca9de47523e76.zip | |
* Merged changes up to eAthena 15088.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15928 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/char/char.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/char/char.c b/src/char/char.c index 46a255716..e0c4cd84d 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3208,7 +3208,7 @@ int lan_subnetcheck(uint32 ip) ARR_FIND( 0, subnet_count, i, (subnet[i].char_ip & subnet[i].mask) == (ip & subnet[i].mask) ); if( i < subnet_count ) { ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", CONVIP(ip), CONVIP(subnet[i].char_ip & subnet[i].mask), CONVIP(subnet[i].mask)); - return subnet[i].char_ip; + return subnet[i].map_ip; } else { ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", CONVIP(ip)); return 0; |