From 571e2f889533054740c7bf979e04031cacf2aa46 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sun, 5 Oct 2014 16:32:49 +0200
Subject: [PATCH] Revert "Option to disable hitbox calculation"

This reverts commit fae330d499e705aac902e3750b089d7744acf1e0.
---
 src/pocketmine/Player.php               | 4 ----
 src/pocketmine/resources/pocketmine.yml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 34fc98ed8..555cda26f 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1104,10 +1104,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 			return;
 		}
 
-		if($this->server->getProperty("movement-check.calculate-hitboxes",true) === false){
-			return;
-		}
-
 		$revert = false;
 
 		if($distance > 100){
diff --git a/src/pocketmine/resources/pocketmine.yml b/src/pocketmine/resources/pocketmine.yml
index ddd3a3afe..a14af2d26 100644
--- a/src/pocketmine/resources/pocketmine.yml
+++ b/src/pocketmine/resources/pocketmine.yml
@@ -89,10 +89,6 @@ auto-updater:
  suggest-channels: true
  host: www.pocketmine.net
 
-movement-check:
- #Teleport players back if they move into a block
- calculate-hitboxes: true
-
 aliases:
  #Examples:
  #showtheversion: version