- Added function battle_attr_ratio to handle just getting the attribute table data. Fixes Sense messing up with elemental based statuses.

- Added Throw tomahawk to the list of items that do not trigger the equipment breaking code.
- Moved a bit around the SC_ start of dancing skills to fix Moonlight petals pushing back the casters.
- Modified status_damage to handle SC_KAZIEL. The return value of *_dead functions can pass 8 to specify that kaziel should not be triggered (ie: pvp/gvg)
- Infinite Endure won't be passed on to devoted characters.
- Infinite Endure is no longer saved on logout.
- Added check to avoid gms opening vending shops if they don't have the required level.
- Moved around the Steel Body S. Novice code, simplified it so it triggers before most of the penalties (death is cancelled).
- Fixed the flee penalty not applying when you walk into a gvg map.


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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/map/vending.c b/src/map/vending.c
index 935971b16..0420d5288 100644
--- a/src/map/vending.c
+++ b/src/map/vending.c
@@ -42,7 +42,6 @@ void vending_closevending(struct map_session_data* sd)
 void vending_vendinglistreq(struct map_session_data* sd, int id)
 {
 	struct map_session_data* vsd;
-
 	nullpo_retv(sd);
 
 	if( (vsd = map_id2sd(id)) == NULL )
@@ -50,6 +49,12 @@ void vending_vendinglistreq(struct map_session_data* sd, int id)
 	if( vsd->vender_id == 0 )
 		return; // not vending
 
+	if ( !pc_can_give_items(pc_isGM(sd)) || !pc_can_give_items(pc_isGM(vsd)) ) //check if both GMs are allowed to trade
+	{	// GM is not allowed to trade
+		clif_displaymessage(sd->fd, msg_txt(246));
+		return;
+	} 
+
 	clif_vendinglist(sd, id, vsd->vending);
 }