mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert "resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download"

Browse Source 
This reverts commit 06ec8b8397.

unfortunately, this had some unanticipated side effects, thanks to
idiotic behaviour in the client ... when having optional downloads but
trying to force resources, the client chokes because it thinks the
server is forcing it to apply a pack that it doesn't have. Since
there's no way to detect when this problem occurs in the protocol, the
only option is to revert this.
This commit is contained in:
Dylan K. Taylor
2020-01-04 16:04:07 +00:00
parent 6490a49c70
commit 4794ba236a
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/resourcepacks/ResourcePackManager.php
View File

@ -43,8 +43,6 @@ class ResourcePackManager{
/** @var bool */
private $serverForceResources = false;
/** @var bool */
private $removeClientResourcePacks = false;
/** @var ResourcePack[] */
private $resourcePacks = [];
@ -73,7 +71,6 @@ class ResourcePackManager{
$resourcePacksConfig = new Config($this->path . "resource_packs.yml", Config::YAML, []);
$this->serverForceResources = (bool) $resourcePacksConfig->get("force_resources", false);
$this->removeClientResourcePacks = (bool) $resourcePacksConfig->get("remove_client_resources", false);
$logger->info("Loading resource packs...");
@ -139,16 +136,6 @@ class ResourcePackManager{
return $this->serverForceResources;
}
/**
* Returns whether client-sided global resources will be removed.
* Useful if you want to force vanilla resources.
*
* @return bool
*/
public function removeClientResourcePacks() : bool{
return $this->removeClientResourcePacks;
}
/**
* Returns an array of resource packs in use, sorted in order of priority.
* @return ResourcePack[]