Merge remote-tracking branch 'mainline/master'

1 files changed, 8 insertions, 4 deletions

diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index a6ba52f6..eae8641a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,6 +1,9 @@
 // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned.
 
 008-1.gat,36,26,0	script	Andra	201,{
+    mes "This script is disabled because of possible bugs";
+    close;
+
     set @water_amount, 1;
     set @seeds_amount, 4;
     if ($@andra_status == 1) goto L_Planting;
@@ -57,8 +60,8 @@ L_PreSummon:
 OnTimer1000:
     set $@plant_id, rand(1029,1032);
     areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
-    if (isloggedin(getcharid(3,$@farmer$))==0) goto L_Spawn1000;    
-    attachrid(getcharid(3,$@farmer$));
+    if (attachrid(getcharid(3,$@farmer$)) == 0)
+        goto L_Spawn1000;
     message strcharinfo(0), "Andra: I think some plants will grow almost instantly! Just Watch...";
 
 L_Spawn1000:
@@ -80,8 +83,8 @@ OnTimer5000:
 OnTimer7000:
     set $@plant_id, rand(1029,1032);
     areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
-    if (isloggedin(getcharid(3,$@farmer$))==0) goto L_Spawn7000;
-    attachrid(getcharid(3,$@farmer$));
+    if (attachrid(getcharid(3,$@farmer$)) == 0)
+        goto L_Spawn7000;
     message strcharinfo(0), "Andra: Good... Just take a walk and you will be able to see how your seeds turned into some nice looking plants.";
 
 L_Spawn7000:
@@ -150,6 +153,7 @@ L_TooYoung:
     close;
 
 OnInit:
+    end;
     set $@PLANTS_PER_SEED, 3;
     set $@MAX_GLOBAL_PLANTS, 100; // You can plant only if the amount of plants currently in the map is < than this value.
     initnpctimer;