From f3550446267f975b33219bdde6aec8fbea614cb2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 4 Jan 2020 16:14:08 +0000 Subject: [PATCH] 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. --- src/pocketmine/Player.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 8d960997c..11001ede0 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -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: