From 96acc868695f151c1e6ea192d367753648fe760e Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 29 Mar 2008 17:54:30 +0000
Subject: [PATCH] - Fixed a visual bug in mail when sending Zeny. - Fixed bug
 pet loosing loot on logout. Bug Report 1291.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12449 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c | 2 +-
 src/map/map.c  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index 0d8a5803a9..0940ea03b4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2231,7 +2231,7 @@ int clif_updatestatus(struct map_session_data *sd,int type)
 
 	case SP_ZENY:
 		WFIFOW(fd,0)=0xb1;
-		WFIFOL(fd,4)=sd->status.zeny - sd->mail.zeny;
+		WFIFOL(fd,4)=sd->status.zeny;
 		break;
 	case SP_BASEEXP:
 		WFIFOW(fd,0)=0xb1;
diff --git a/src/map/map.c b/src/map/map.c
index 8ca1ac5f1f..c2260feef7 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1617,6 +1617,9 @@ int map_quit(struct map_session_data *sd)
 		}
 	}
 	
+	// Return loot to owner
+	if( sd->pd ) pet_lootitem_drop(sd->pd, sd);
+
 	unit_remove_map_pc(sd,3);
 	pc_makesavestatus(sd);
 	pc_clean_skilltree(sd);