summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-03-11 00:39:53 +0100
committerGitHub <noreply@github.com>2019-03-11 00:39:53 +0100
commit28eb50882484697b10fa4764b3e0fd91d9e12a4e (patch)
tree0e385090ba73ffcece2909d03eb3df9a019a52a6
parent63b87d387dade9a66db16607864ae2bd5fcdc57a (diff)
parent76a336eea15b0af70ebe4d3dd13b25f1f503e03c (diff)
downloadhercules-28eb50882484697b10fa4764b3e0fd91d9e12a4e.tar.gz
hercules-28eb50882484697b10fa4764b3e0fd91d9e12a4e.tar.bz2
hercules-28eb50882484697b10fa4764b3e0fd91d9e12a4e.tar.xz
hercules-28eb50882484697b10fa4764b3e0fd91d9e12a4e.zip
Merge pull request #2381 from AnnieRuru/60-bg_norespawn
Add missing documentation for disable battleground respawn
-rw-r--r--doc/script_commands.txt7
-rw-r--r--src/map/script.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 55f5a9fe7..30d7f9512 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -9618,6 +9618,11 @@ is run when they relog.
<On Death Event> refers to an NPC label that attaches to the character and
is run when they die. Can be "" for empty.
+If "-" is supplied for <mapname>, this will remove the 1 second automatic
+respawn on the battleground map. This allows for better manipulation of
+<On Death Event>. The player will have to be warped to desired location
+at the end of <On Death Event>.
+
Unlike the prior command, the latter will attach a GROUP in a waiting room
to the battleground, and sets the array $@arenamembers[0] where 0 holds
the IDs of the first group, and 1 holds the IDs of the second.
@@ -9749,6 +9754,8 @@ mapflag%TAB%<map_name>%TAB%battleground%TAB%2
This command will create a new BG Team.
When player dies, they will be respawned map_name,X,Y as mentioned.
+If "-" is supplied for the map name, this will remove the 1 second automatic
+respawn on the battleground map.
Command will return -1 if BG Creation is failed,
else it will return the BG ID(Also known as TeamID).
diff --git a/src/map/script.c b/src/map/script.c
index 24cb8e4f4..1977d3b58 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -23687,7 +23687,7 @@ static BUILDIN(bg_create_team)
if( strcmp(map_name,"-") != 0 ) {
map_index = script->mapindexname2id(st,map_name);
if( map_index == 0 ) { // Invalid Map
- script_pushint(st,0);
+ script_pushint(st, -1);
return true;
}
}