Fixes Battlegrounds and atcommand reloadscript (#7002)

* Fixes #6175.
* Fixes an issue where the Battleground Queue System could become stuck if a GM uses atcommand reloadscript.
Thanks to @roSBK!
This commit is contained in:
Aleos 2022-06-02 20:38:26 -04:00 committed by GitHub
parent 86c8950e7f
commit b804120246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 0 deletions

View File

@ -77,6 +77,8 @@ OnTimer1000:
//============================================================
bat_b01,15,15,3 script start#bat_b01 844,{
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_b01";
mapwarp "bat_b01","bat_room",154,150;
end;

View File

@ -79,6 +79,8 @@ OnTimer1000:
//============================================================
bat_b02,15,15,3 script start#bat_b02 844,{
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_b02";
mapwarp "bat_b02","bat_room",154,150;
end;

View File

@ -111,6 +111,9 @@ OnTouch:
end;
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_c01";
mapwarp "bat_c01","bat_room",154,150;
setwall "bat_c01",54,122,6,7,0,"batc01wall_a";
setwall "bat_c01",55,122,5,7,0,"batc01wall_b";
setwall "bat_c01",140,56,6,7,0,"batc01wall_c";

View File

@ -111,6 +111,9 @@ OnTouch:
end;
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_c02";
mapwarp "bat_c02","bat_room",154,150;
setwall "bat_c02",54,122,6,7,0,"batc02wall_a";
setwall "bat_c02",55,122,5,7,0,"batc02wall_b";
setwall "bat_c02",140,56,6,7,0,"batc02wall_c";

View File

@ -111,6 +111,9 @@ OnTouch:
end;
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_c03";
mapwarp "bat_c03","bat_room",154,150;
setwall "bat_c03",54,122,6,7,0,"batc03wall_a";
setwall "bat_c03",55,122,5,7,0,"batc03wall_b";
setwall "bat_c03",140,56,6,7,0,"batc03wall_c";

View File

@ -98,6 +98,8 @@ bat_room,57,211,0 warp back_bgrooma01b 1,1,bat_room,154,150
//============================================================
bat_a01,15,15,3 script start#bat_a01 844,{
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_a01";
mapwarp "bat_a01","bat_room",154,150;
end;

View File

@ -98,6 +98,8 @@ bat_room,113,211,0 warp back_bgrooma02b 1,1,bat_room,154,150
//============================================================
bat_a02,15,15,3 script start#bat_a02 844,{
OnInit:
if (getbattleflag("feature.bgqueue"))
bg_unbook "bat_a02";
mapwarp "bat_a02","bat_room",154,150;
end;