- Fixed npc_checknear's distance check returning the opposite of what it should (false when the range is correct and viceversa)

- SL_STIN/SL_STUN have dex-reducable casting times now.
- Added a warning on item loading when an item is of equippable type but has no equippable position.
- Turning an alliance to an opposition won't work now during WoE
- Slaves can summon other mobs now. The only ones who can't do this are player summoned mobs.
- Merged the following functions for faster processing of items:
  clif_storageitemlist + clif_storageequiplist = clif_storagelist
  clif_guildstorageitemlist + clif_guildstorageequiplist = clif_guildstoragelist
  clif_itemlist + clif_equiplist = clif_inventorylist
- Increased max knockback value support to 25.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7109 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 3 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 6cef53b59..168f6cb62 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2200,9 +2200,7 @@ int atcommand_option(
 	sd->sc.opt1 = param1;

 	sd->sc.opt2 = param2;

 	if (!(sd->sc.option & CART_MASK) && param3 & CART_MASK) {

-		if (sd->status.class_ == JOB_BABY_MERCHANT)

-			clif_cart_itemlist(sd);

-		clif_cart_equiplist(sd);

+		clif_cartlist(sd);

 		clif_updatestatus(sd, SP_CARTINFO);

 	}

 	pc_setoption(sd, param3);