Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_invite_NPCs' into 'master'

Browse Source 
Make npcs decline invites until we have a better recruitment system

See merge request veloren/veloren!1358
This commit is contained in:
Monty Marz 2020-09-03 23:49:32 +00:00
commit 7dab96a9cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/sys/agent.rs
View File

@ -554,10 +554,10 @@ impl<'a> System<'a> for Sys {
}
// Process group invites
for (_invite, alignment, agent, controller) in
(&invites, &alignments, &mut agents, &mut controllers).join()
for (_invite, /*alignment,*/ agent, controller) in
(&invites, /*&alignments,*/ &mut agents, &mut controllers).join()
{
let accept = matches!(alignment, Alignment::Npc);
let accept = false; // set back to "matches!(alignment, Alignment::Npc)" when we got better NPC recruitment mechanics
if accept {
// Clear agent comp
*agent = Agent::default();