diff --git a/src/pocketmine/event/server/ServerCommandEvent.php b/src/pocketmine/event/server/ServerCommandEvent.php
index 6b3ef2a98..6a82e67d7 100644
--- a/src/pocketmine/event/server/ServerCommandEvent.php
+++ b/src/pocketmine/event/server/ServerCommandEvent.php
@@ -50,6 +50,13 @@ class ServerCommandEvent extends ServerEvent implements Cancellable{
 		$this->command = $command;
 	}
 
+	/**
+	 * @return CommandSender
+	 */
+	public function getSender(){
+		return $this->sender;
+	}
+
 	/**
 	 * @return string
 	 */
diff --git a/src/pocketmine/level/format/generic/BaseChunk.php b/src/pocketmine/level/format/generic/BaseChunk.php
index 48f6d4342..6888c2c52 100644
--- a/src/pocketmine/level/format/generic/BaseChunk.php
+++ b/src/pocketmine/level/format/generic/BaseChunk.php
@@ -215,7 +215,7 @@ abstract class BaseChunk implements Chunk{
 				$column = $this->sections[$Y]->getBlockIdColumn($x, $z);
 				for($y = 15; $y >= 0; --$y){
 					if($column{$y} !== "\x00"){
-						return $y + $Y << 4;
+						return $y + ($Y << 4);
 					}
 				}
 			}