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

Merge pull request #1506 from PEMapModder/master

Browse Source 
Multiple permissions checked in Server::getInstance()
This commit is contained in:
Shoghi Cervantes 2014-06-17 16:15:39 +02:00
commit 552c934486
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/Server.php
View File

@ -1476,21 +1476,24 @@ class Server{
/** /**
* @param string $message * @param string $message
* @param string $permission * @param string $permissions
* *
* @return int * @return int
*/ */
public function broadcast($message, $permission){ public function broadcast($message, $permissions){
$count = 0; $recipients = [];
foreach($this->pluginManager->getPermissionSubscriptions($permission) as $permissible){ foreach(explode(";", $permissions) as $permission){
if($permissible instanceof CommandSender and $permissible->hasPermission($permission)){ foreach($this->pluginManager->getPermissionSubscriptions($permission) as $permissible){
$permissible->sendMessage($message); if($permissible instanceof CommandSender and $permissible->hasPermission($permission)){
++$count; $recipients[spl_object_hash($permissible)] = $permissible; // do not send messages directly, or some might be repeated
}
} }
} }
foreach($recipients as $recipient){
return $count; $recipient->sendMessage($message);
} }
return count($recipients);
}
/** /**
* Broadcasts a Minecraft packet to a list of players * Broadcasts a Minecraft packet to a list of players