From 0c798222a4af61fd5dac719466469dd336453466 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 10 Aug 2017 18:04:44 +0100
Subject: [PATCH] ... blame PhpStorm EAP

---
 src/pocketmine/block/Block.php   | 2 +-
 src/pocketmine/entity/Entity.php | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php
index fcc50afd6..da971e24d 100644
--- a/src/pocketmine/block/Block.php
+++ b/src/pocketmine/block/Block.php
@@ -846,7 +846,7 @@ class Block extends Position implements BlockIds, Metadatable{
 
 	public function hasMetadata(string $metadataKey) : bool{
 		if($this->getLevel() instanceof Level){
-			 return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
+			return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
 		}
 
 		return false;
diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 4d690b8f8..43e069674 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -1872,8 +1872,9 @@ abstract class Entity extends Location implements Metadatable{
 		$this->close();
 	}
 
-	public function setMetadata(string $metadataKey, MetadataValue $metadataValue){
-		$this->server->getEntityMetadata()->setMetadata($this, $metadataKey, $metadataValue);
+
+	public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
+		$this->server->getEntityMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
 	}
 
 	public function getMetadata(string $metadataKey){
@@ -1884,8 +1885,8 @@ abstract class Entity extends Location implements Metadatable{
 		return $this->server->getEntityMetadata()->hasMetadata($this, $metadataKey);
 	}
 
-	public function removeMetadata(string $metadataKey, Plugin $plugin){
-		$this->server->getEntityMetadata()->removeMetadata($this, $metadataKey, $plugin);
+	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
+		$this->server->getEntityMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 	}
 
 	public function __toString(){