From 0fa9f37474f63b4c938db96c1f74bb376ad55e7f Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 22 Apr 2012 17:30:17 +0000
Subject: [PATCH] * Merged changes up to eAthena 15088.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15928 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/char/char.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/char/char.c b/src/char/char.c
index 46a2557169..e0c4cd84d6 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;