* Fixed guild manager charging twice for invest

- Corrected some treasure room switch sent-to spawns.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index ecd119780..d9282f935 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -35,6 +35,7 @@
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Daily investement will now be reset. [L0ne_W0lf]
 //=     Template will no longer try to spawn chests.
+//= 1.2 Fixed Eco Invest option charging twice. [L0ne_W0lf]
 //============================================================
 
 // AGIT Manager Template
@@ -159,6 +160,7 @@ OnAgitBreak:
 OnAgitEnd:
 	if (strnpcinfo(0) == "Gld_Agit_Manager") end;
 	GvgOff strnpcinfo(2);
+	// If the castle has no owner at the end of WoE, do not kill Emperium.
 	if (GetCastleData(strnpcinfo(2),1)) {
 		KillMonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak";
 	}
@@ -538,7 +540,6 @@ OnRecvCastle:
 				close;
 			}
 			set zeny,zeny-.@eco_invest;
-			set zeny,zeny-.@eco_invest;
 			SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1;
 			SetCastleData strnpcinfo(2),2,.@Economy + 1 + (.@Economy<99 && rand(2) && getgdskilllv(.@GID,10014));
 			mes "[ Steward .@name$]";