mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 21:59:52 +00:00
Code Issues Projects Releases Wiki Activity

Added Player::getRemoveFormat() and Player::setRemoveFormat(bool) to choose showing colors in chat and nametags

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-06-17 15:54:06 +02:00
parent 79bc42c995
commit 3bd33a129f
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/Player.php
View File

@ -132,6 +132,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
protected $connected = true; protected $connected = true;
protected $clientID; protected $clientID;
protected $ip; protected $ip;
protected $removeFormat = true;
protected $port; protected $port;
protected $username; protected $username;
protected $iusername; protected $iusername;
@ -228,6 +229,20 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
return $this->server; return $this->server;
} }
/**
* @return bool
*/
public function getRemoveFormat(){
return $this->removeFormat;
}
/**
* @param bool $remove
*/
public function setRemoveFormat($remove = true){
$this->removeFormat = (bool) $remove;
}
/** /**
* @param Player $player * @param Player $player
* *
@ -424,10 +439,16 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->displayName = $name; $this->displayName = $name;
} }
/**
* @return string
*/
public function getNameTag(){ public function getNameTag(){
return $this->nameTag; return $this->nameTag;
} }
/**
* @param string $name
*/
public function setNameTag($name){ public function setNameTag($name){
$this->nameTag = $name; $this->nameTag = $name;
$this->despawnFromAll(); $this->despawnFromAll();
@ -1979,7 +2000,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
if($m !== ""){ if($m !== ""){
$pk = new MessagePacket; $pk = new MessagePacket;
$pk->author = ""; //Do not use this ;) $pk->author = ""; //Do not use this ;)
$pk->message = TextFormat::clean($m); //Colors not implemented :( $pk->message = $this->removeFormat === false ? $m : TextFormat::clean($m);
$this->dataPacket($pk); $this->dataPacket($pk);
} }
} }

7
src/pocketmine/entity/Human.php
View File

@ -34,6 +34,7 @@ use pocketmine\network\protocol\AddPlayerPacket;
use pocketmine\network\protocol\RemovePlayerPacket; use pocketmine\network\protocol\RemovePlayerPacket;
use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\protocol\SetEntityMotionPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\TextFormat;
class Human extends Creature implements ProjectileSource, InventoryHolder{ class Human extends Creature implements ProjectileSource, InventoryHolder{
@ -135,7 +136,11 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$pk = new AddPlayerPacket; $pk = new AddPlayerPacket;
$pk->clientID = 0; $pk->clientID = 0;
$pk->username = $this->nameTag; if($player->getRemoveFormat()){
$pk->username = TextFormat::clean($this->nameTag);
}else{
$pk->username = $this->nameTag;
}
$pk->eid = $this->getID(); $pk->eid = $this->getID();
$pk->x = $this->x; $pk->x = $this->x;
$pk->y = $this->y; $pk->y = $this->y;