resources: do not remove client-side resource packs when forcing resources

I wanted to make this into a dedicated option, but it had some side effects (see 4794ba236a551bd839bbb8565474c19f93d97c30).
I'll settle for just disabling this useless behaviour, since we have other ways to force vanilla resources anyway; setting this flag to always-false has no user-facing effects anyway.
This commit is contained in:
Dylan K. Taylor 2020-01-04 16:14:08 +00:00
parent 4794ba236a
commit f355044626

View File

@ -2118,7 +2118,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$pk = new ResourcePackStackPacket();
$manager = $this->server->getResourcePackManager();
$pk->resourcePackStack = $manager->getResourceStack();
$pk->mustAccept = $manager->resourcePacksRequired();
//we don't force here, because it doesn't have user-facing effects
//but it does have an annoying side-effect when true: it makes
//the client remove its own non-server-supplied resource packs.
$pk->mustAccept = false;
$this->dataPacket($pk);
break;
case ResourcePackClientResponsePacket::STATUS_COMPLETED: