summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormomacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-11 05:45:02 +0000
committermomacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-11 05:45:02 +0000
commit3a791b60705a86733221579714d8aa24948aa382 (patch)
tree4b3ba602d41cf87b2c8332a05764f2c22db10d6f
parentb1314dc6edd57ac2e57852821072b68cf3811362 (diff)
downloadhercules-3a791b60705a86733221579714d8aa24948aa382.tar.gz
hercules-3a791b60705a86733221579714d8aa24948aa382.tar.bz2
hercules-3a791b60705a86733221579714d8aa24948aa382.tar.xz
hercules-3a791b60705a86733221579714d8aa24948aa382.zip
Fixed bugreport:6452 where you weren't able to remove your cart if you weren't merchant/alchemist/blacksmith/etc. It also fixes the previously not working removal of cart when jobchanging.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16911 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index f93aa8835..e2a224c84 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7448,7 +7448,7 @@ int pc_setcart(struct map_session_data *sd,int type) {
if( type < 0 || type > MAX_CARTS )
return 1;// Never trust the values sent by the client! [Skotlex]
- if( pc_checkskill(sd,MC_PUSHCART) <= 0 )
+ if( pc_checkskill(sd,MC_PUSHCART) <= 0 && type != 0 )
return 1;// Push cart is required
if( type == 0 && pc_iscarton(sd) )