From 0ac81968b797b09e933a59386d6c63bb0e5dcea3 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Mon, 25 Nov 2013 11:02:33 +0100 Subject: [PATCH] OCD --- src/API/PermissionsAPI.php | 16 +++++----------- src/recipes/CraftingRecipes.php | 3 ++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/API/PermissionsAPI.php b/src/API/PermissionsAPI.php index 5615c3830..0ef95725c 100644 --- a/src/API/PermissionsAPI.php +++ b/src/API/PermissionsAPI.php @@ -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; } } \ No newline at end of file diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index e20db2c5a..d309683ae 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -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",//