diff --git a/Changes b/Changes index b92a2dcda..e9c29b12d 100644 --- a/Changes +++ b/Changes @@ -232,3 +232,4 @@ [fixes] - Fixed a +d bug (it didnt send ` prefixes) - Fixed a SJOIN bug, i think, thanks to Web +- Fixed a chinese nick thing, thanks to miCro and RexHsu \ No newline at end of file diff --git a/src/s_serv.c b/src/s_serv.c index d794607eb..4f86232ed 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -3886,7 +3886,7 @@ int m_restart(cptr, sptr, parc, parv) sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); return 0; } - if (parc > 2) + if (parc > 3) { /* Remote restart. */ if (MyClient(sptr) && !(IsNetAdmin(sptr) || IsTechAdmin(sptr))) diff --git a/src/s_user.c b/src/s_user.c index e01fdac32..8d9610236 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -467,11 +467,11 @@ int isvalidChinese(const unsigned char c1, const unsigned char c2) const unsigned int JPN_PIAN_E = 0xa5f7; unsigned int AWord = c1 * 256 + c2; #if defined(CHINESE_NICK) && defined(JAPANESE_NICK) - return (AWord >= GBK_S && AWord <= GBK_E || AWord >= GBK_2_S && AWord <= GBK_2_E || AWord >= GBK_3_S && AWord <= GBK_3_E + return (AWord >= GBK_S && AWord <= GBK_E || AWord >= GBK_2_S && AWord <= GBK_2_E || AWord >= JPN_PING_S && AWord <= JPN_PING_E || AWord >= JPN_PIAN_S && AWord <= JPN_PIAN_E) ? 1 : 0; #endif #if defined(CHINESE_NICK) && !defined(JAPANESE_NICK) - return (AWord >= GBK_S && AWord <= GBK_E || AWord >= GBK_2_S && AWord <= GBK_2_E || AWord >= GBK_3_S && AWord <= GBK_3_E ? 1 : 0); + return (AWord >= GBK_S && AWord <= GBK_E || AWord >= GBK_2_S && AWord <= GBK_2_E ? 1 : 0); #endif #if !defined(CHINESE_NICK) && defined(JAPANESE_NICK) return (AWord >= JPN_PING_S && AWord <= JPN_PING_E || AWord >= JPN_PIAN_S && AWord <= JPN_PIAN_E) ? 1 : 0;