[skip ci] Measures against @Crazyfefe leaving party and only rejoin for boss :>

1 files changed, 15 insertions, 2 deletions

diff --git a/npc/008-0/master.txt b/npc/008-0/master.txt
index 85f9d2e38..adf4211bd 100644
--- a/npc/008-0/master.txt
+++ b/npc/008-0/master.txt
@@ -83,7 +83,10 @@
 // Only the party leader can start this. But you can rejoin, as long map leader is on 008-x
 L_NotYou:
     getmapxy(.@m$, .@x, .@y, 0, getpartyleader(getcharid(1)));
-    if (.@m$ ~= "008-*" && @pmloop) {
+    if (.@m$ ~= "008-*" &&
+        .@m$ != "008-0" &&
+        BaseLevel > 0 &&
+        @pmloop) {
         mesn;
         mesq l("@@, your party leader, is inside, I'm not sure where.", getpartyleader(getcharid(1)));
         mesc l("Enter dungeons? You won't be able to join anymore when he dies."), 1;
@@ -91,7 +94,7 @@ L_NotYou:
             close;
         // Double check
         getmapxy(.@m$, .@x, .@y, 0, getpartyleader(getcharid(1)));
-        if (.@m$ ~= "008-*")
+        if (.@m$ ~= "008-*" && .@m$ != "008-0" && getcharid(1) > 0)
             warp "008-1", 176, 20;
     } else {
         mesn;
@@ -112,6 +115,16 @@ OnStart:
     @pmloop=0;
 OnLoop:
     @pmloop+=1;
+
+    // Anti-Crazyfefe™ Alpha System
+    if (getcharid(1) <= 0) {
+        // Left the party!
+        @pmloop=0;
+        warp "008-0", 47, 64;
+        dispbottom l("You are not a member of a party anymore.");
+    }
+
+    // Add new cycle or finish.
     if (@pmloop < 1200) {
         addtimer(1000, "Party Master::OnLoop");
     } else {