From de415edfde3e9e219ade298a306258f5c279b04c Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 14 Apr 2006 15:58:56 +0000 Subject: [PATCH] - Fixed being able to do all the stuff you shouldn't be able to during the petrifying state. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6059 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ src/map/clif.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6d54f106d2..8ffc937e83 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2006/04/14 + * Fixed being able to do all the stuff you shouldn't be able to during the + petrifying state. [Skotlex] 2006/04/13 * Updated sql-files/item_db.sql to current. [Skotlex] * Added an Info message when pinging the SQL servers. [Skotlex] diff --git a/src/map/clif.c b/src/map/clif.c index bbb42a873a..b7e856d57f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -161,7 +161,7 @@ enum { //Removed sd->npc_shopid because there is no packet sent from the client when you cancel a buy! //Quick check to know if the player shouldn't be "busy" with something else to deny action requests. [Skotlex] -#define clif_cant_act(sd) (sd->npc_id || sd->vender_id || sd->chatID || (sd->sc.opt1 && sd->sc.opt1 != OPT1_STONEWAIT) || sd->trade_partner || sd->state.storage_flag) +#define clif_cant_act(sd) (sd->npc_id || sd->vender_id || sd->chatID || sd->sc.opt1 || sd->trade_partner || sd->state.storage_flag) // Checks if SD is in a trade/shop (where messing with the inventory can cause problems/exploits) #define clif_trading(sd) (sd->npc_id || sd->vender_id || sd->trade_partner) @@ -8154,7 +8154,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd) { return; } - if (clif_cant_act(sd)) + if (clif_cant_act(sd) && sd->sc.opt1 != OPT1_STONEWAIT) return; if (!unit_can_move(&sd->bl))