From b6025e3f2b6338347665d70fdd4860c4c08630b3 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Mon, 6 Oct 2014 16:45:11 +0200
Subject: [PATCH] Removed selectors on Player->sendMessage()

---
 src/pocketmine/Player.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 3c1261ce9a..1af2f65ec1 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2220,29 +2220,11 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 	public function sendMessage($message){
 		$mes = explode("\n", $message);
 		foreach($mes as $m){
-			if(preg_match_all('#@([@A-Za-z_]{1,})#', $m, $matches, PREG_OFFSET_CAPTURE) > 0){
-				$offsetshift = 0;
-				foreach($matches[1] as $selector){
-					if($selector[0]{0} === "@"){ //Escape!
-						$m = substr_replace($m, $selector[0], $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
-						--$offsetshift;
-						continue;
-					}
-					switch(strtolower($selector[0])){
-						case "player":
-						case "username":
-							$m = substr_replace($m, $this->username, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
-							$offsetshift += strlen($selector[0]) - strlen($this->username) + 1;
-							break;
-					}
-				}
-			}
-
 			if($m !== ""){
 				$pk = new MessagePacket;
 				$pk->source = ""; //Do not use this ;)
 				$pk->message = $this->removeFormat === false ? $m : TextFormat::clean($m);
-				$this->directDataPacket($pk);
+				$this->dataPacket($pk);
 			}
 		}
 	}