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

Fixed villager professions being useless

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-08 14:13:48 +01:00
parent 8fafef2f7f
commit 3738ab1f8a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/entity/Villager.php
View File

@ -33,7 +33,6 @@ class Villager extends Creature implements NPC, Ageable{
const PROFESSION_PRIEST = 2; const PROFESSION_PRIEST = 2;
const PROFESSION_BLACKSMITH = 3; const PROFESSION_BLACKSMITH = 3;
const PROFESSION_BUTCHER = 4; const PROFESSION_BUTCHER = 4;
const PROFESSION_GENERIC = 5;
const NETWORK_ID = 15; const NETWORK_ID = 15;
@ -46,9 +45,20 @@ class Villager extends Creature implements NPC, Ageable{
protected function initEntity(){ protected function initEntity(){
parent::initEntity(); parent::initEntity();
if(!isset($this->namedtag->Profession)){
$this->setProfession(self::PROFESSION_GENERIC); /** @var int $profession */
$profession = $this->namedtag["Profession"] ?? self::PROFESSION_FARMER;
if($profession > 4 or $profession < 0){
$profession = self::PROFESSION_FARMER;
} }
$this->setProfession($profession);
}
public function saveNBT(){
parent::saveNBT();
$this->namedtag->Profession = new IntTag("Profession", $this->getProfession());
} }
public function spawnTo(Player $player){ public function spawnTo(Player $player){
@ -71,11 +81,11 @@ class Villager extends Creature implements NPC, Ageable{
* @param int $profession * @param int $profession
*/ */
public function setProfession(int $profession){ public function setProfession(int $profession){
$this->namedtag->Profession = new IntTag("Profession", $profession); $this->setDataProperty(self::DATA_VARIANT, self::DATA_TYPE_INT, $profession);
} }
public function getProfession() : int{ public function getProfession() : int{
return (int) $this->namedtag["Profession"]; return $this->getDataProperty(self::DATA_VARIANT);
} }
public function isBaby() : bool{ public function isBaby() : bool{