mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 14:35:35 +00:00
Code Issues Projects Releases Wiki Activity

Server: rename getResourcePackManager()

Browse Source 
casual BC break, ain't nobody got time for deprecations!

closes #1797
This commit is contained in:
Dylan K. Taylor 2018-02-11 17:17:56 +00:00
parent b75d121c7e
commit 98d6aea7fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@ -1950,7 +1950,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->server->onPlayerLogin($this); $this->server->onPlayerLogin($this);
$pk = new ResourcePacksInfoPacket(); $pk = new ResourcePacksInfoPacket();
$manager = $this->server->getResourceManager(); $manager = $this->server->getResourcePackManager();
$pk->resourcePackEntries = $manager->getResourceStack(); $pk->resourcePackEntries = $manager->getResourceStack();
$pk->mustAccept = $manager->resourcePacksRequired(); $pk->mustAccept = $manager->resourcePacksRequired();
$this->dataPacket($pk); $this->dataPacket($pk);
@ -1963,7 +1963,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->close("", "You must accept resource packs to join this server.", true); $this->close("", "You must accept resource packs to join this server.", true);
break; break;
case ResourcePackClientResponsePacket::STATUS_SEND_PACKS: case ResourcePackClientResponsePacket::STATUS_SEND_PACKS:
$manager = $this->server->getResourceManager(); $manager = $this->server->getResourcePackManager();
foreach($packet->packIds as $uuid){ foreach($packet->packIds as $uuid){
$pack = $manager->getPackById($uuid); $pack = $manager->getPackById($uuid);
if(!($pack instanceof ResourcePack)){ if(!($pack instanceof ResourcePack)){
@ -1986,7 +1986,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
break; break;
case ResourcePackClientResponsePacket::STATUS_HAVE_ALL_PACKS: case ResourcePackClientResponsePacket::STATUS_HAVE_ALL_PACKS:
$pk = new ResourcePackStackPacket(); $pk = new ResourcePackStackPacket();
$manager = $this->server->getResourceManager(); $manager = $this->server->getResourcePackManager();
$pk->resourcePackStack = $manager->getResourceStack(); $pk->resourcePackStack = $manager->getResourceStack();
$pk->mustAccept = $manager->resourcePacksRequired(); $pk->mustAccept = $manager->resourcePacksRequired();
$this->dataPacket($pk); $this->dataPacket($pk);
@ -2888,7 +2888,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{ public function handleResourcePackChunkRequest(ResourcePackChunkRequestPacket $packet) : bool{
$manager = $this->server->getResourceManager(); $manager = $this->server->getResourcePackManager();
$pack = $manager->getPackById($packet->packId); $pack = $manager->getPackById($packet->packId);
if(!($pack instanceof ResourcePack)){ if(!($pack instanceof ResourcePack)){
$this->close("", "disconnectionScreen.resourcePack", true); $this->close("", "disconnectionScreen.resourcePack", true);

2
src/pocketmine/Server.php
View File

@ -640,7 +640,7 @@ class Server{
/** /**
* @return ResourcePackManager * @return ResourcePackManager
*/ */
public function getResourceManager() : ResourcePackManager{ public function getResourcePackManager() : ResourcePackManager{
return $this->resourceManager; return $this->resourceManager;
} }