- Fixed bugreport:6460 where players can enter instances without generating it. (EndlessTower.txt & SealedShrine.txt)

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

1 files changed, 10 insertions, 16 deletions

diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index ada7dabcb..ed6965462 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -3,11 +3,11 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Seal away the Great Demon Baphomet.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
@@ -22,6 +22,7 @@
 //= 1.7 Fixed a checkquest condition never setting quest. [L0ne_W0lf]
 //= 1.8 Added 'instance_check_party' command to the script for proper checking if
 //=		the invoking party meets the requirements to join the Memorial Dungeon.
+//= 1.9 Fixed broken else/if chaining. [Joseph]
 //============================================================ 
 
 // Sealed Catacomb Entrance
@@ -255,48 +256,41 @@ monk_test,309,146,3	script	Friar Patrick#edq	412,{
 }
 
 monk_test,306,151,3	script	Grave of Baphomet#edq	111,{
-	if (countitem(6002) > 0)
-		delitem 6002,countitem(6002); //Token_Of_Apostle
+	if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
 	mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
 	next;
 	switch(select("Touch the stone.:Step back.")) {
 	case 1:
-
 		set .@party_id,getcharid(1);
 		set .@instance, instance_id(1);
 		instance_attach(.@instance);
-
+		
 		// 12 hour cooldown
 		set .@ins_bapho_check,checkquest(3040,PLAYTIME);
 		// Two hour play limit
 		//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
-
+		
 		if(!instance_check_party(.@party_id,2,75)){
 			mes "I'm sorry but your Party does not meet the requirements to join the Memorial Dungeon.";
 			close;
 		}
-
 		if (.@ins_bapho_check == -1) {
 			if (has_instance("1@cata") == "") {
 				mes "It's cold to the touch. It doesn't respond.";
-			}
-			if((party_instance_id4 != 0) && (party_instance_id4 != getcharid(1))) {
+			} else if((party_instance_id4 != 0) && (party_instance_id4 != getcharid(1))) {
 				mes "It seems you have entered this shrine recently... You cannot reenter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
-			}
-			else {
+			} else {
 				mapannounce "monk_test","[" + strcharinfo(0) + "] member of the [" + getpartyname(.@party_id) + "] party has entered the Sealed Shrine.",bc_map,"0x00ff99";
 				if (checkquest(3040) == -1) setquest 3040;
 				set party_instance_id4,getcharid(1);
 				warp "1@cata",100,224;
 				end;
 			}
-		}
-		else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+		} else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
 			mes "[Friar Patrick]";
 			mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains.";
 			mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
-		}
-		else if (.@ins_bapho_check == 2) {
+		} else if (.@ins_bapho_check == 2) {
 			mes "[Friar Patrick]";
 			mes "Umm... It seems the curse of Baphomet weakened. I'll clear the bad curse.";
 			next;