I hate the guild castle scripts. Reverted a change.

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

2 files changed, 6 insertions, 3 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 003975c20..9cd25451d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/04/05
+	* Rev. 12496 I hate the guild castle scripts. Reverted a change. [L0ne_W0lf]
 	* Rev. 12495 Further updates to Zhed's Veins addition. [L0ne_W0lf]
 2008/04/04
 	* Rev. 12472 Updated NIflheim Town and Quest NPCs. [L0ne_W0lf]
diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index d082d9c6d..4eb634a93 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -32,8 +32,10 @@
 //= 1.7 Updated functions, got rid of the various gotos. [L0ne_W0lf]
 //=	Castles can be conquered as long as they un-owned.
 //= 1.8 Fixed Guardian data being overwritten when castle ownership changes. [L0ne_W0lf]
-//	Data will only be saved for guardians if you have the Guaridan Research.
-//	It works this way to deal with a bug on ownership change.
+//=	Data will only be saved for guardians if you have the Guaridan Research.
+//=	It works this way to deal with a bug on ownership change.
+//= 1.9 Due to compunded stupidity in the way these scripts were written [L0ne_W0lf]
+//=	I have recommented out the official behavior for unaquired castles.
 //============================================================
 
 
@@ -181,7 +183,7 @@ function	script	F_AgitEnd	{
 	GvgOff .@map$;
 	// Disable the following if statment to keep empty
 	// castles from being aquired after after WoE ends.
-	if (GetCastleData(.@map$,1) == 0) return;
+	//if (GetCastleData(.@map$,1) == 0) return;
 	MapRespawnGuildID .@map$,GetCastleData(.@map$,1),4;
 	KillMonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak";
 	end;