Merge branch 'ark'

feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent bd6c6c4fc2
commit a58af169ab
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -2519,7 +2519,6 @@ NLMISC_COMMAND(setUrl, "changes the url of a bot", "<uid> <groupname> [<url>] [<
return true;
}
//----------------------------------------------------------------------------
NLMISC_COMMAND(temporaryRename, "rename a player for the event", "<uid> <new name>")
{
@ -2557,7 +2556,6 @@ NLMISC_COMMAND(getArkMissions,"dump character ark missions","<uid>")
return true;
}
//-----------------------------------------------
NLMISC_COMMAND(getPlayerStats,"get player stats","<uid> <stat1,stat2,stat3..>")
{
@ -2687,7 +2685,6 @@ NLMISC_COMMAND(addCheckPos,"add check pos","<uid> <x> <y> <radius> <mission_name
return true;
}
//-----------------------------------------------
NLMISC_COMMAND(spawnArkMission,"spawn Mission","<uid> <bot_name> <mission_name>")
{
@ -3146,11 +3143,11 @@ NLMISC_COMMAND(addPlayerPet, "add a pet to player", "<uid> <sheetid> [size] [nam
CSheetId ticket = CSheetId(args[1]);
uint8 size = 100;
if (args.size() == 3)
if (args.size() >= 3)
fromString(args[2], size);
ucstring customName;
if (args.size() == 4)
if (args.size() >= 4)
customName.fromUtf8(args[3]);
if (ticket != CSheetId::Unknown)

Loading…
Cancel
Save