Fixed some dirty lines

VonHirsch · May 1, 2015 · 4654656 · 4654656
1 parent 20669c9
commit 4654656
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 22 deletions.
diff --git a/EconomyAPI/src/onebone/economyapi/EconomyAPI.php b/EconomyAPI/src/onebone/economyapi/EconomyAPI.php
@@ -410,7 +410,7 @@ public function getAllMoney(){
 	 * @return array
 	*/
 	public function getAllBankMoney(){
-		return $this->getLogger()->warning("Bank system is now deprecated");
+		$this->getLogger()->warning("Bank system is now deprecated");
 	}
 
 	/**

diff --git a/EconomyAPI/src/onebone/economyapi/event/EconomyAPIEvent.php b/EconomyAPI/src/onebone/economyapi/event/EconomyAPIEvent.php
@@ -20,7 +20,6 @@
 
 namespace onebone\economyapi\event;
 
-use pocketmine\plugin\Plugin;
 use pocketmine\event\plugin\PluginEvent;
 use pocketmine\event\Cancellable;
 

diff --git a/EconomyAPI/src/onebone/economyapi/event/account/CreateAccountEvent.php b/EconomyAPI/src/onebone/economyapi/event/account/CreateAccountEvent.php
@@ -24,7 +24,7 @@
 use onebone\economyapi\EconomyAPI;
 
 class CreateAccountEvent extends EconomyAPIEvent{
-	private $player, $username, $defaultMoney;
+	private $username, $defaultMoney;
 	public static $handlerList;
 
 	public function __construct(EconomyAPI $plugin, $username, $defaultMoney, $issuer){

diff --git a/EconomyAPI/src/onebone/economyapi/event/money/MoneyChangedEvent.php b/EconomyAPI/src/onebone/economyapi/event/money/MoneyChangedEvent.php
@@ -24,7 +24,7 @@
 use onebone\economyapi\event\EconomyAPIEvent;
 
 class MoneyChangedEvent extends EconomyAPIEvent{
-	private $plugin, $username, $money;
+	private $username, $money;
 	public static $handlerList;
 
 	public function __construct(EconomyAPI $plugin, $username, $money, $issuer){

diff --git a/EconomyAPI/src/onebone/economyapi/event/money/ReduceMoneyEvent.php b/EconomyAPI/src/onebone/economyapi/event/money/ReduceMoneyEvent.php
@@ -24,7 +24,7 @@
 use onebone\economyapi\EconomyAPI;
 
 class ReduceMoneyEvent extends EconomyAPIEvent{
-	private $plugin, $username, $amount;
+	private $username, $amount;
 	public static $handlerList;
 
 	public function __construct(EconomyAPI $plugin, $username, $amount, $issuer){

diff --git a/EconomyAuction/src/onebone/economyauction/EconomyAuction.php b/EconomyAuction/src/onebone/economyauction/EconomyAuction.php
@@ -241,6 +241,7 @@ public function onCommand(CommandSender $sender, Command $command, $label, array
 			}
 			return true;
 		}
+		return true;
 	}
 
 	public function quitAuction($auction){

diff --git a/EconomyJob/src/onebone/economyjob/EconomyJob.php b/EconomyJob/src/onebone/economyjob/EconomyJob.php
@@ -76,9 +76,10 @@ public function onDisable(){
 	}
 
 	/**
-		@priority LOWEST
-		@ignoreCancelled true
-	*/
+	 * @priority LOWEST
+	 * @ignoreCancelled true
+	 * @param BlockBreakEvent $event
+	 */
 	public function onBlockBreak(BlockBreakEvent $event){
 		$player = $event->getPlayer();
 		$block = $event->getBlock();
@@ -92,9 +93,10 @@ public function onBlockBreak(BlockBreakEvent $event){
 	}
 
 	/**
-		@priority LOWEST
-		@ignoreCancelled true
-	*/
+	 * @priority LOWEST
+	 * @ignoreCancelled true
+	 * @param BlockPlaceEvent $event
+	 */
 	public function onBlockPlace(BlockPlaceEvent $event){
 		$player = $event->getPlayer();
 		$block = $event->getBlock();

diff --git a/EconomyLand/src/onebone/economyland/EconomyLand.php b/EconomyLand/src/onebone/economyland/EconomyLand.php
@@ -20,7 +20,6 @@
 
 namespace onebone\economyland;
 
-use onebone\economyland\event\LandAddedEvent;
 use pocketmine\math\Vector3;
 use pocketmine\plugin\PluginBase;
 use pocketmine\event\Listener;
@@ -39,7 +38,6 @@
 use pocketmine\plugin\MethodEventExecutor;
 
 use onebone\economyapi\EconomyAPI;
-use onebone\economyland\database\SQLiteDatabase;
 use onebone\economyland\database\YamlDatabase;
 use onebone\economyland\database\Database;
 
@@ -585,7 +583,7 @@ public function permissionCheck(Event $event){
 			return false;
 		}
 
-		$exist = false;
+		//$exist = false;
 		//$result = $this->land->query("SELECT owner,invitee FROM land WHERE level = '$level' AND endX > $x AND endZ > $z AND startX < $x AND startZ < $z");
 		//if(!is_array($info)) goto checkLand;
 		$info = $this->db->canTouch($x, $z, $level, $player);
@@ -610,6 +608,7 @@ public function permissionCheck(Event $event){
 			}
 			return false;
 		}
+		return true;
 	}
 
 	public function addLand($player, $startX, $startZ, $endX, $endZ, $level, $expires = null){

diff --git a/EconomySell/src/onebone/economysell/EconomySell.php b/EconomySell/src/onebone/economysell/EconomySell.php
@@ -26,16 +26,9 @@
 use pocketmine\plugin\PluginBase;
 use pocketmine\event\Listener;
 use pocketmine\event\block\BlockPlaceEvent;
-use pocketmine\tile\Sign;
-use pocketmine\math\Vector3;
 use pocketmine\utils\Config;
 use pocketmine\item\Item;
-use pocketmine\event\server\DataPacketReceiveEvent;
 use pocketmine\network\protocol\EntityDataPacket;
-use pocketmine\nbt\NBT;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Int;
-use pocketmine\nbt\tag\String;
 use onebone\economyapi\EconomyAPI;
 
 #define TAG 1

diff --git a/EconomyUsury/src/onebone/economyusury/EconomyUsury.php b/EconomyUsury/src/onebone/economyusury/EconomyUsury.php
@@ -94,7 +94,7 @@ public function closeUsuryHost($player){
 			}
 			$data = $this->getServer()->getOfflinePlayerData($username);
 			$count = $this->usuryHosts[$player]["players"][$key][2];
-			foreach($data->Inventory as $key => $item){
+			foreach($data->Inventory as $key => $item){ //FIXME: The $key is already used in outer foreach loop
 				if($item["id"] == $this->usuryHosts[$player]["players"][$key][0] and $item["Damage"] == $this->usuryHosts[$player]["players"][$key][1]){
 					$i = Item::get($this->usuryHosts[$player]["players"][$key][0], $this->usuryHosts[$player]["players"][$key][1], $this->usuryHosts[$player]["players"][$key][2]);
 					$giveCnt = min($count, $i->getMaxStackSize());
@@ -111,5 +111,6 @@ public function closeUsuryHost($player){
 		}
 
 		unset($this->usuryHosts[$player]);
+		return true;
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			return true;
     		}
+    		return true;
     	}
     	public function quitAuction($auction){
@@ Expand Down @@