mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michael Yoo 2013-11-25 20:34:57 +10:30
commit 2339525478
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/API/PermissionsAPI.php
View File

@ -83,8 +83,7 @@ interface Permission{
public function isGranted($permission);
}
class DefaultPermission implements Permission//TODO: Remove this in the future for a better system than a default permission.
{
class DefaultPermission implements Permission{//TODO: Remove this in the future for a better system than a default permission.
/**
* @var integer
*/
@ -95,14 +94,10 @@ class DefaultPermission implements Permission//TODO: Remove this in the future f
*
* @return boolean
*/
public function isGranted($permissionToCheckGranted)
{
if($this->getPermissionLevel() >= $permissionToCheckGranted->getPermissionLevel())
{
public function isGranted($permissionToCheckGranted){
if($this->getPermissionLevel() >= $permissionToCheckGranted->getPermissionLevel()){
return true;
}
else
{
}else{
return false;
}
}
@ -110,8 +105,7 @@ class DefaultPermission implements Permission//TODO: Remove this in the future f
/**
* @return integer
*/
public function getPermissionLevel()
{
public function getPermissionLevel(){
return $this->permissionLevel;
}
}

3
src/recipes/CraftingRecipes.php
View File

@ -80,7 +80,8 @@ class CraftingRecipes{
"DYE:4x1,DYE:15x1=>DYE:12x2",
"DYE:2x1,DYE:4x1=>DYE:6x2",
"DYE:1x1,DYE:4x1=>DYE:5x2",
"DYE:1x1,DYE:4x1,DYE:15x1=>DYE:13x3",
"DYE:1x1,DYE:4x1,DYE:15x1=>DYE:13x3",
"BEETROOT:?x1=>DYE:1x1",
"DYE:15x1,DYE:1x2,DYE:4x1=>DYE:13x4",//
"DYE:5x1,DYE:9x1=>DYE:13x2",//
"DYE:0x1,DYE:15x1=>DYE:8x2",//