From 92d617bbb052fe0c38f08597a398ab7fc674790f Mon Sep 17 00:00:00 2001 From: icxbb-xx Date: Fri, 4 Dec 2015 20:27:30 +0700 Subject: [PATCH] Fixed #807 * Add missing packets version check, @thank you to @cold-hr --- db/packet_db.txt | 7 ++++--- src/map/clif.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/db/packet_db.txt b/db/packet_db.txt index 8f35d0db7f..96ca976ff8 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -1715,6 +1715,10 @@ packet_keys: 0x382A6DEF,0x5CBE7202,0x61F46637 // [Shakto] 0x0439,8,useitem,2:4 0x0365,41,bookingregreq,2:4:6 +0x090F,-1 // ZC_NOTIFY_NEWENTRY7 +0x0914,-1 // ZC_NOTIFY_MOVEENTRY7 +0x0915,-1 // ZC_NOTIFY_STANDENTRY7 + //2012-04-10aRagexeRE packet_ver: 30 packet_keys: 0x01581359,0x452D6FFA,0x6AFB6E2E // [Shakto] @@ -1863,9 +1867,6 @@ packet_keys: 0x3F094C49,0x55F86C1E,0x58AA359A // [Shakto] 0x08d2,10 0x0907,5,moveitem,2:4 0x0908,5 -0x090f,-1 // notify_newentry7 -0x0914,-1 // notify_moveentry -0x0915,-1 // notify_standentry 0x0922,-1,reqtradebuyingstore,2:4:8:12 //0x092e,2,searchstoreinfonextpage,0 0x0933,6,takeitem,2 diff --git a/src/map/clif.c b/src/map/clif.c index ab25c30db0..c18b9fba19 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1111,7 +1111,7 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool #if PACKETVER >= 20080102 WBUFW(buf,53) = (sd ? sd->status.font : 0); #endif -#if PACKETVER >= 20130807 +#if PACKETVER >= 20120221 if ( battle_config.monster_hp_bars_info && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) { WBUFL(buf,55) = status_get_max_hp(bl); // maxHP WBUFL(buf,59) = status_get_hp(bl); // HP @@ -1128,7 +1128,7 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool buf = WBUFP(buffer,offset); #endif #if PACKETVER >= 20091103 -#if PACKETVER >= 20130807 +#if PACKETVER >= 20120221 memcpy((char*)WBUFP(buf,64), name, NAME_LENGTH); #else memcpy((char*)WBUFP(buf,55), name, NAME_LENGTH); @@ -1254,7 +1254,7 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un #if PACKETVER >= 20080102 WBUFW(buf,60) = (sd ? sd->status.font : 0); #endif -#if PACKETVER >= 20130807 +#if PACKETVER >= 20120221 if ( battle_config.monster_hp_bars_info && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) { WBUFL(buf,62) = status_get_max_hp(bl); // maxHP WBUFL(buf,66) = status_get_hp(bl); // HP @@ -1271,7 +1271,7 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un buf = WBUFP(buffer,offset); #endif #if PACKETVER >= 20091103 -#if PACKETVER >= 20130807 +#if PACKETVER >= 20120221 memcpy((char*)WBUFP(buf,71), name, NAME_LENGTH); #else memcpy((char*)WBUFP(buf,62), name, NAME_LENGTH);