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

New events, item methods

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-05 10:16:08 +01:00
parent 2bdc8c400e
commit d69fe5d5e7
13 changed files with 598 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -5,6 +5,7 @@
*.txt text eol=lf *.txt text eol=lf
*.properties text eol=lf *.properties text eol=lf
*.bat text eol=crlf *.bat text eol=crlf
*.cmd text eol=crlf
# Custom for Visual Studio # Custom for Visual Studio
*.cs diff=csharp *.cs diff=csharp

8
.gitignore vendored
View File

@ -1,19 +1,11 @@
players/* players/*
worlds/* worlds/*
plugins/* plugins/*
logs/*
bin/* bin/*
.idea/*
*.log *.log
*.pmf
*.txt *.txt
server.properties server.properties
############
## Windows
############
# Windows image file caches # Windows image file caches
Thumbs.db Thumbs.db

125
src/Achievement.php Normal file
View File

@ -0,0 +1,125 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
abstract class Achievement{
public static $list = array(
/*"openInventory" => array(
"name" => "Taking Inventory",
"requires" => array(),
),*/
"mineWood" => array(
"name" => "Getting Wood",
"requires" => array(
//"openInventory",
),
),
"buildWorkBench" => array(
"name" => "Benchmarking",
"requires" => array(
"mineWood",
),
),
"buildPickaxe" => array(
"name" => "Time to Mine!",
"requires" => array(
"buildWorkBench",
),
),
"buildFurnace" => array(
"name" => "Hot Topic",
"requires" => array(
"buildPickaxe",
),
),
"acquireIron" => array(
"name" => "Acquire hardware",
"requires" => array(
"buildFurnace",
),
),
"buildHoe" => array(
"name" => "Time to Farm!",
"requires" => array(
"buildWorkBench",
),
),
"makeBread" => array(
"name" => "Bake Bread",
"requires" => array(
"buildHoe",
),
),
"bakeCake" => array(
"name" => "The Lie",
"requires" => array(
"buildHoe",
),
),
"buildBetterPickaxe" => array(
"name" => "Getting an Upgrade",
"requires" => array(
"buildPickaxe",
),
),
"buildSword" => array(
"name" => "Time to Strike!",
"requires" => array(
"buildWorkBench",
),
),
"diamonds" => array(
"name" => "DIAMONDS!",
"requires" => array(
"acquireIron",
),
),
);
public static function broadcast(Player $player, $achievementId){
if(isset(Achievement::$list[$achievementId])){
$result = ServerAPI::request()->api->dhandle("achievement.broadcast", array("player" => $player, "achievementId" => $achievementId));
if($result !== false and $result !== true){
if(ServerAPI::request()->api->getProperty("announce-player-achievements") == true){
ServerAPI::request()->api->chat->broadcast($player->getUsername()." has just earned the achievement ".Achievement::$list[$achievementId]["name"]);
}else{
$player->sendChat("You have just earned the achievement ".Achievement::$list[$achievementId]["name"]);
}
}
return true;
}
return false;
}
public static function add($achievementId, $achievementName, array $requires = array()){
if(!isset(Achievement::$list[$achievementId])){
Achievement::$list[$achievementId] = array(
"name" => $achievementName,
"requires" => $requires,
);
return true;
}
return false;
}
}

250
src/Player.php
View File

@ -51,9 +51,6 @@ class Player extends PlayerEntity{
public $CID; public $CID;
public $MTU; public $MTU;
public $spawned = false; public $spawned = false;
public $slot;
public $hotbar;
public $armor = array();
public $loggedIn = false; public $loggedIn = false;
public $gamemode; public $gamemode;
public $lastBreak; public $lastBreak;
@ -313,7 +310,6 @@ class Player extends PlayerEntity{
$this->port = $port; $this->port = $port;
$this->spawnPosition = $this->server->spawn; $this->spawnPosition = $this->server->spawn;
$this->timeout = microtime(true) + 20; $this->timeout = microtime(true) + 20;
$this->armor = array();
$this->gamemode = $this->server->gamemode; $this->gamemode = $this->server->gamemode;
$this->level = $this->server->api->level->getDefault(); $this->level = $this->server->api->level->getDefault();
$this->viewDistance = (int) $this->server->api->getProperty("view-distance"); $this->viewDistance = (int) $this->server->api->getProperty("view-distance");
@ -498,55 +494,6 @@ class Player extends PlayerEntity{
$this->namedtag->SpawnY = (int) $this->spawnPosition->y; $this->namedtag->SpawnY = (int) $this->spawnPosition->y;
$this->namedtag->SpawnZ = (int) $this->spawnPosition->z; $this->namedtag->SpawnZ = (int) $this->spawnPosition->z;
//Hotbar
for($slot = 0; $slot < 9; ++$slot){
if(isset($this->hotbar[$slot]) and $this->hotbar[$slot] !== -1){
$item = $this->getSlot($this->hotbar[$slot]);
if($item->getID() !== AIR and $item->getCount() > 0){
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"TrueSlot" => new NBTTag_Byte("TrueSlot", $this->hotbar[$slot]),
"id" => new NBTTag_Short("id", $item->getID()),
));
continue;
}
}
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", 0),
"Damage" => new NBTTag_Short("Damage", 0),
"Slot" => new NBTTag_Byte("Slot", $slot),
"TrueSlot" => new NBTTag_Byte("Slot", -1),
"id" => new NBTTag_Short("id", 0),
));
}
//Normal inventory
$slotCount = (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS) + 9;
for($slot = 9; $slot < $slotCount; ++$slot){
$item = $this->getSlot($slot);
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"id" => new NBTTag_Short("id", $item->getID()),
));
}
//Armor
for($slot = 100; $slot < 104; ++$slot){
$item = $this->armor[$slot - 100];
if($item instanceof Item){
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"id" => new NBTTag_Short("id", $item->getID()),
));
}
}
foreach($this->achievements as $achievement => $status){ foreach($this->achievements as $achievement => $status){
$this->namedtag->Achievements[$achievement] = new NBTTag_Byte($achievement, $status === true ? 1:0); $this->namedtag->Achievements[$achievement] = new NBTTag_Byte($achievement, $status === true ? 1:0);
} }
@ -670,27 +617,6 @@ class Player extends PlayerEntity{
return true; return true;
} }
public function setArmor($slot, Item $armor, $send = true){
$this->armor[(int) $slot] = $armor;
if($send === true){
$this->sendArmor($this);
}
return true;
}
/**
* @param integer $slot
*
* @return Item
*/
public function getArmor($slot){
if(isset($this->armor[(int) $slot])){
return $this->armor[(int) $slot];
}else{
return BlockAPI::getItem(AIR, 0, 0);
}
}
/** /**
* @param mixed $data * @param mixed $data
* @param string $event * @param string $event
@ -731,18 +657,6 @@ class Player extends PlayerEntity{
} }
} }
break; break;
case "player.armor":
if($data["player"]->level === $this->level){
if($data["eid"] === $this->id){
$this->sendArmor($this);
break;
}
$pk = new PlayerArmorEquipmentPacket;
$pk->eid = $data["eid"];
$pk->slots = $data["slots"];
$this->dataPacket($pk);
}
break;
case "player.pickup": case "player.pickup":
if($data["eid"] === $this->id){ if($data["eid"] === $this->id){
$data["eid"] = 0; $data["eid"] = 0;
@ -767,20 +681,6 @@ class Player extends PlayerEntity{
$pk->target = $data["entity"]->getID(); $pk->target = $data["entity"]->getID();
$this->dataPacket($pk); $this->dataPacket($pk);
} }
break;
case "player.equipment.change":
if($data["eid"] === $this->id or $data["player"]->level !== $this->level){
break;
}
$data["slot"] = 0;
$pk = new PlayerEquipmentPacket;
$pk->eid = $data["eid"];
$pk->item = $data["item"]->getID();
$pk->meta = $data["item"]->getMetadata();
$pk->slot = $data["slot"];
$this->dataPacket($pk);
break; break;
case "entity.motion": case "entity.motion":
if($data->getID() === $this->id or $data->level !== $this->level){ if($data->getID() === $this->id or $data->level !== $this->level){
@ -1372,31 +1272,6 @@ class Player extends PlayerEntity{
return; return;
} }
$this->hotbar = array(-1, -1, -1, -1, -1, -1, -1, -1, -1);
$this->armor = array(
0 => BlockAPI::getItem(AIR, 0, 0),
1 => BlockAPI::getItem(AIR, 0, 0),
2 => BlockAPI::getItem(AIR, 0, 0),
3 => BlockAPI::getItem(AIR, 0, 0)
);
foreach($nbt->Inventory as $item){
if($item->Slot >= 0 and $item->Slot < 9){ //Hotbar
$this->hotbar[$item->Slot] = isset($item->TrueSlot) ? $item->TrueSlot:-1;
}elseif($item->Slot >= 100 and $item->Slot < 104){ //Armor
$this->armor[$item->Slot - 100] = BlockAPI::getItem($item->id, $item->Damage, $item->Count);
}else{
$this->inventory[$item->Slot - 9] = BlockAPI::getItem($item->id, $item->Damage, $item->Count);
}
}
if(($this->gamemode & 0x01) === 0x01){
$this->slot = 0;
$this->hotbar = array();
}else{
$this->slot = $this->hotbar[0];
}
$this->achievements = array(); $this->achievements = array();
foreach($nbt->Achievements->getValue() as $achievement){ foreach($nbt->Achievements->getValue() as $achievement){
$this->achievements[$achievement->getName()] = $achievement->getValue() > 0 ? true : false; $this->achievements[$achievement->getName()] = $achievement->getValue() > 0 ? true : false;
@ -1411,6 +1286,13 @@ class Player extends PlayerEntity{
parent::__construct($this->level, $nbt); parent::__construct($this->level, $nbt);
if(($this->gamemode & 0x01) === 0x01){
$this->slot = 0;
$this->hotbar[0] = 0;
}else{
$this->slot = $this->hotbar[0];
}
$pk = new StartGamePacket; $pk = new StartGamePacket;
$pk->seed = $this->level->getSeed(); $pk->seed = $this->level->getSeed();
$pk->x = $this->x; $pk->x = $this->x;
@ -1437,8 +1319,6 @@ class Player extends PlayerEntity{
$this->evid[] = $this->server->event("entity.animate", array($this, "eventHandler")); $this->evid[] = $this->server->event("entity.animate", array($this, "eventHandler"));
$this->evid[] = $this->server->event("entity.event", array($this, "eventHandler")); $this->evid[] = $this->server->event("entity.event", array($this, "eventHandler"));
$this->evid[] = $this->server->event("entity.metadata", array($this, "eventHandler")); $this->evid[] = $this->server->event("entity.metadata", array($this, "eventHandler"));
$this->evid[] = $this->server->event("player.equipment.change", array($this, "eventHandler"));
$this->evid[] = $this->server->event("player.armor", array($this, "eventHandler"));
$this->evid[] = $this->server->event("player.pickup", array($this, "eventHandler")); $this->evid[] = $this->server->event("player.pickup", array($this, "eventHandler"));
$this->evid[] = $this->server->event("tile.container.slot", array($this, "eventHandler")); $this->evid[] = $this->server->event("tile.container.slot", array($this, "eventHandler"));
$this->evid[] = $this->server->event("tile.update", array($this, "eventHandler")); $this->evid[] = $this->server->event("tile.update", array($this, "eventHandler"));
@ -1526,59 +1406,37 @@ class Player extends PlayerEntity{
if($this->spawned === false){ if($this->spawned === false){
break; break;
} }
$packet->eid = $this->id;
$data = array();
$data["eid"] = $packet->eid;
$data["player"] = $this;
if($packet->slot === 0x28 or $packet->slot === 0){ //0 for 0.8.0 compatibility if($packet->slot === 0x28 or $packet->slot === 0){ //0 for 0.8.0 compatibility
$data["slot"] = -1; $packet->slot = -1; //Air
$data["item"] = BlockAPI::getItem(AIR, 0, 0);
if($this->server->handle("player.equipment.change", $data) !== false){
$this->slot = -1;
}
break;
}else{ }else{
$packet->slot -= 9; $packet->slot -= 9;
} }
if(($this->gamemode & 0x01) === CREATIVE){
if(($this->gamemode & 0x01) === SURVIVAL){
$data["item"] = $this->getSlot($packet->slot);
if(!($data["item"] instanceof Item)){
break;
}
}elseif(($this->gamemode & 0x01) === CREATIVE){
$packet->slot = false; $packet->slot = false;
foreach(BlockAPI::$creative as $i => $d){ foreach(BlockAPI::$creative as $i => $d){
if($d[0] === $packet->item and $d[1] === $packet->meta){ if($d[0] === $packet->item and $d[1] === $packet->meta){
$packet->slot = $i; $packet->slot = $i;
$item = BlockAPI::getItem($d[0], $d[1], 1);
break; break;
} }
} }
if($packet->slot !== false){
$data["item"] = $this->getSlot($packet->slot);
}else{
break;
}
}else{ }else{
break;//????? $item = $this->getSlot($packet->slot);
} }
$data["slot"] = $packet->slot; if($packet->slot === false or EventHandler::callEvent(new PlayerEquipmentChangeEvent($this, $item, $packet->slot, 0)) === BaseEvent::DENY){
$this->sendInventorySlot($packet->slot);
if($this->server->handle("player.equipment.change", $data) !== false){ }else{
$this->slot = $packet->slot; $this->setEquipmentSlot(0, $packet->slot);
$this->setCurrentEquipmentSlot(0);
if(($this->gamemode & 0x01) === SURVIVAL){ if(($this->gamemode & 0x01) === SURVIVAL){
if(!in_array($this->slot, $this->hotbar)){ if(!in_array($this->slot, $this->hotbar)){
array_pop($this->hotbar); array_pop($this->hotbar);
array_unshift($this->hotbar, $this->slot); array_unshift($this->hotbar, $this->slot);
} }
} }
}else{
$this->sendInventorySlot($packet->slot);
//$this->sendInventory();
} }
if($this->inAction === true){ if($this->inAction === true){
$this->inAction = false; $this->inAction = false;
@ -1766,14 +1624,13 @@ class Player extends PlayerEntity{
$this->toCraft = array(); $this->toCraft = array();
$this->server->api->block->playerBlockBreak($this, $blockVector); $this->server->api->block->playerBlockBreak($this, $blockVector);
break; break;
/*case ProtocolInfo::PLAYER_ARMOR_EQUIPMENT_PACKET: case ProtocolInfo::PLAYER_ARMOR_EQUIPMENT_PACKET:
if($this->spawned === false or $this->blocked === true){ if($this->spawned === false or $this->blocked === true){
break; break;
} }
$this->craftingItems = array(); $this->craftingItems = array();
$this->toCraft = array(); $this->toCraft = array();
$packet->eid = $this->id;
for($i = 0; $i < 4; ++$i){ for($i = 0; $i < 4; ++$i){
$s = $packet->slots[$i]; $s = $packet->slots[$i];
if($s === 0 or $s === 255){ if($s === 0 or $s === 255){
@ -1781,29 +1638,40 @@ class Player extends PlayerEntity{
}else{ }else{
$s = BlockAPI::getItem($s + 256, 0, 1); $s = BlockAPI::getItem($s + 256, 0, 1);
} }
$slot = $this->armor[$i]; $slot = $this->getArmorSlot($i);
if($slot->getID() !== AIR and $s->getID() === AIR){ if($slot->getID() !== AIR and $s->getID() === AIR){
$this->addItem($slot); if($this->setArmorSlot($i, BlockAPI::getItem(AIR, 0, 0)) === false){
$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0); $this->sendArmor();
$packet->slots[$i] = 255; $this->sendInventory();
}else{
$this->addItem($slot);
$packet->slots[$i] = 255;
}
}elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){ }elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){
$this->armor[$i] = $this->getSlot($sl); if($this->setArmorSlot($i, $this->getSlot($sl)) === false){
$this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0)); $this->sendArmor();
$this->sendInventory();
}else{
$this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0));
}
}elseif($s->getID() !== AIR and $slot->getID() !== AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s->getID())) !== false){ }elseif($s->getID() !== AIR and $slot->getID() !== AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s->getID())) !== false){
$item = $this->armor[$i]; if($this->setArmorSlot($i, $this->getSlot($sl)) === false){
$this->armor[$i] = $this->getSlot($sl); $this->sendArmor();
$this->setSlot($sl, $item); $this->sendInventory();
}else{
$this->setSlot($sl, $slot);
}
}else{ }else{
$packet->slots[$i] = 255; $packet->slots[$i] = 255;
} }
} }
$this->sendArmor();
if($this->entity->inAction === true){ if($this->inAction === true){
$this->entity->inAction = false; $this->inAction = false;
$this->entity->updateMetadata(); //$this->entity->updateMetadata();
} }
break;*/ break;
/*case ProtocolInfo::INTERACT_PACKET: /*case ProtocolInfo::INTERACT_PACKET:
if($this->spawned === false){ if($this->spawned === false){
break; break;
@ -2264,40 +2132,6 @@ class Player extends PlayerEntity{
} }
} }
/**
* @param Player|string|boolean|void $player
*/
public function sendArmor($player = false){
$data = array(
"player" => $this,
"eid" => $this->id,
"slots" => array()
);
for($i = 0; $i < 4; ++$i){
if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > AIR){
$data["slots"][$i] = $this->armor[$i]->getID() !== AIR ? $this->armor[$i]->getID() - 256:0;
}else{
$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
$data["slots"][$i] = 255;
}
}
if($player instanceof Player){
if($player === $this){
$pk = new ContainerSetContentPacket;
$pk->windowid = 0x78; //Armor window id
$pk->slots = $this->armor;
$this->dataPacket($pk);
}else{
$pk = new PlayerArmorEquipmentPacket;
$pk->eid = $this->id;
$pk->slots = $data["slots"];
$player->dataPacket($pk);
}
}else{
$this->server->api->dhandle("player.armor", $data);
}
}
public function sendInventory(){ public function sendInventory(){
if(($this->gamemode & 0x01) === CREATIVE){ if(($this->gamemode & 0x01) === CREATIVE){
return; return;

163
src/entity/HumanEntity.php
View File

@ -23,15 +23,88 @@ class HumanEntity extends CreatureEntity implements ProjectileSourceEntity, Inve
protected $nameTag = "TESTIFICATE"; protected $nameTag = "TESTIFICATE";
protected $inventory = array(); protected $inventory = array();
public $slot;
protected $hotbar = array();
protected $armor = array();
protected function initEntity(){ protected function initEntity(){
if(isset($this->namedtag->NameTag)){ if(isset($this->namedtag->NameTag)){
$this->nameTag = $this->namedtag->NameTag; $this->nameTag = $this->namedtag->NameTag;
} }
$this->hotbar = array(-1, -1, -1, -1, -1, -1, -1, -1, -1);
$this->armor = array(
0 => BlockAPI::getItem(AIR, 0, 0),
1 => BlockAPI::getItem(AIR, 0, 0),
2 => BlockAPI::getItem(AIR, 0, 0),
3 => BlockAPI::getItem(AIR, 0, 0)
);
foreach($nbt->Inventory as $item){
if($item->Slot >= 0 and $item->Slot < 9){ //Hotbar
$this->hotbar[$item->Slot] = isset($item->TrueSlot) ? $item->TrueSlot:-1;
}elseif($item->Slot >= 100 and $item->Slot < 104){ //Armor
$this->armor[$item->Slot - 100] = BlockAPI::getItem($item->id, $item->Damage, $item->Count);
}else{
$this->inventory[$item->Slot - 9] = BlockAPI::getItem($item->id, $item->Damage, $item->Count);
}
}
$this->slot = $this->hotbar[0];
$this->height = 1.8; //Or 1.62? $this->height = 1.8; //Or 1.62?
$this->width = 0.6; $this->width = 0.6;
} }
public function saveNBT(){
parent::saveNBT();
for($slot = 0; $slot < 9; ++$slot){
if(isset($this->hotbar[$slot]) and $this->hotbar[$slot] !== -1){
$item = $this->getSlot($this->hotbar[$slot]);
if($item->getID() !== AIR and $item->getCount() > 0){
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"TrueSlot" => new NBTTag_Byte("TrueSlot", $this->hotbar[$slot]),
"id" => new NBTTag_Short("id", $item->getID()),
));
continue;
}
}
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", 0),
"Damage" => new NBTTag_Short("Damage", 0),
"Slot" => new NBTTag_Byte("Slot", $slot),
"TrueSlot" => new NBTTag_Byte("Slot", -1),
"id" => new NBTTag_Short("id", 0),
));
}
//Normal inventory
$slotCount = (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS) + 9;
for($slot = 9; $slot < $slotCount; ++$slot){
$item = $this->getSlot($slot);
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"id" => new NBTTag_Short("id", $item->getID()),
));
}
//Armor
for($slot = 100; $slot < 104; ++$slot){
$item = $this->armor[$slot - 100];
if($item instanceof Item){
$this->namedtag->Inventory[$slot] = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
"Slot" => new NBTTag_Byte("Slot", $slot),
"id" => new NBTTag_Short("id", $item->getID()),
));
}
}
}
public function spawnTo(Player $player){ public function spawnTo(Player $player){
if($player !== $this and !isset($this->hasSpawned[$player->getID()])){ if($player !== $this and !isset($this->hasSpawned[$player->getID()])){
$this->hasSpawned[$player->getID()] = $player; $this->hasSpawned[$player->getID()] = $player;
@ -57,17 +130,9 @@ class HumanEntity extends CreatureEntity implements ProjectileSourceEntity, Inve
$pk->speedZ = $this->motionZ; $pk->speedZ = $this->motionZ;
$player->dataPacket($pk); $player->dataPacket($pk);
/* $this->sendCurrentEquipmentSlot($player);
$pk = new PlayerEquipmentPacket;
$pk->eid = $this->id;
$pk->item = $this->player->getSlot($this->player->slot)->getID();
$pk->meta = $this->player->getSlot($this->player->slot)->getMetadata();
$pk->slot = 0;
$player->dataPacket($pk);*/
//$this->sendEquipment($player); $this->sendArmor($player);
//$this->sendArmor($player);
} }
} }
@ -81,6 +146,78 @@ class HumanEntity extends CreatureEntity implements ProjectileSourceEntity, Inve
} }
} }
public function setEquipmentSlot($equipmentSlot, $inventorySlot){
$this->hotbar[$equipmentSlot] = $inventorySlot;
if($equipmentSlot === $this->slot){
foreach($this->hasSpawned as $p){
$this->sendEquipmentSlot($p);
}
}
}
public function setCurrentEquipmentSlot($slot){
if(isset($this->hotbar[$slot])){
$this->slot = (int) $slot;
foreach($this->hasSpawned as $p){
$this->sendEquipmentSlot($p);
}
}
}
public function sendCurrentEquipmentSlot(Player $player){
$pk = new PlayerEquipmentPacket;
$pk->eid = $this->id;
$pk->item = $this->getSlot($this->slot)->getID();
$pk->meta = $this->getSlot($this->slot)->getMetadata();
$pk->slot = 0;
$player->dataPacket($pk);
}
public function setArmorSlot($slot, Item $item){
if(EventHandler::callEvent($ev = new EntityArmorChangeEvent($this, $this->getArmorSlot($slot), $item, $slot)) === BaseEvent::DENY){
return false;
}
$this->armor[(int) $slot] = $ev->getNewItem();
foreach($this->hasSpawned as $p){
$this->sendArmor($p);
}
if($this instanceof Player){
$this->sendArmor();
}
return true;
}
public function getArmorSlot($slot){
$slot = (int) $slot;
if(!isset($this->armor[$slot])){
$this->armor[$slot] = BlockAPI::getItem(AIR, 0, 0);
}
return $this->armor[$slot];
}
public function sendArmor(Player $player = null){
$slots = array();
for($i = 0; $i < 4; ++$i){
if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > AIR){
$slots[$i] = $this->armor[$i]->getID() !== AIR ? $this->armor[$i]->getID() - 256:0;
}else{
$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
$slots[$i] = 255;
}
}
if($player instanceof Player){
$pk = new PlayerArmorEquipmentPacket;
$pk->eid = $this->id;
$pk->slots = $slots;
$player->dataPacket($pk);
}elseif($this instanceof Player){
$pk = new ContainerSetContentPacket;
$pk->windowid = 0x78; //Armor window id
$pk->slots = $this->armor;
$this->dataPacket($pk);
}
}
public function getMetadata(){ //TODO public function getMetadata(){ //TODO
$flags = 0; $flags = 0;
$flags |= $this->fireTicks > 0 ? 1:0; $flags |= $this->fireTicks > 0 ? 1:0;
@ -211,7 +348,11 @@ class HumanEntity extends CreatureEntity implements ProjectileSourceEntity, Inve
} }
public function setSlot($slot, Item $item){ public function setSlot($slot, Item $item){
$this->inventory[(int) $slot] = $item; if(EventHandler::callEvent($ev = new EntityInventoryChangeEvent($this, $this->getSlot($slot), $item, $slot)) === BaseEvent::DENY){
return false;
}
$this->inventory[(int) $slot] = $ev->getNewItem();
return true;
} }
public function getSlot($slot){ public function getSlot($slot){

4
src/event/EntityEvent.php
View File

@ -22,10 +22,6 @@
abstract class EntityEvent extends BaseEvent{ abstract class EntityEvent extends BaseEvent{
protected $entity; protected $entity;
public function __construct(Entity $entity){
$this->entity = $entity;
}
public function getEntity(){ public function getEntity(){
return $this->entity; return $this->entity;
} }

28
src/event/PlayerEvent.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
abstract class PlayerEvent extends BaseEvent{
protected $player;
public function getPlayer(){
return $this->player;
}
}

28
src/event/TileEvent.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
abstract class TileEvent extends BaseEvent{
protected $tile;
public function getTile(){
return $this->tile;
}
}

54
src/event/entity/EntityArmorChangeEvent.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
class EntityArmorChangeEvent extends EntityEvent implements CancellableEvent{
public static $handlers;
public static $handlerPriority;
private $oldItem;
private $newItem;
private $slot;
public function __construct(Entity $entity, Item $oldItem, Item $newItem, $slot){
$this->entity = $entity;
$this->oldItem = $oldItem;
$this->newItem = $newItem;
$this->slot = (int) $slot;
}
public function getSlot(){
return $this->slot;
}
public function getNewItem(){
return $this->newItem;
}
public function setNewItem(Item $item){
$this->newItem = $item;
}
public function getOldItem(){
return $this->oldItem;
}
}

54
src/event/entity/EntityInventoryChangeEvent.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
class EntityInventoryChangeEvent extends EntityEvent implements CancellableEvent{
public static $handlers;
public static $handlerPriority;
private $oldItem;
private $newItem;
private $slot;
public function __construct(Entity $entity, Item $oldItem, Item $newItem, $slot){
$this->entity = $entity;
$this->oldItem = $oldItem;
$this->newItem = $newItem;
$this->slot = (int) $slot;
}
public function getSlot(){
return $this->slot;
}
public function getNewItem(){
return $this->newItem;
}
public function setNewItem(Item $item){
$this->newItem = $item;
}
public function getOldItem(){
return $this->oldItem;
}
}

49
src/event/player/PlayerEquipmentChangeEvent.php Normal file
View File

@ -0,0 +1,49 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
class PlayerEquipmentChangeEvent extends PlayerEvent implements CancellableEvent{
public static $handlers;
public static $handlerPriority;
private $item;
private $slot;
private $inventorySlot;
public function __construct(Player $player, Item $item, $inventorySlot, $slot){
$this->player = $player;
$this->item = $item;
$this->inventorySlot = (int) $inventorySlot;
$this->slot = (int) $slot;
}
public function getSlot(){
return $this->slot;
}
public function getInventorySlot(){
return $this->inventorySlot;
}
public function getItem(){
return $this->item;
}
}

54
src/event/tile/TileInventoryChange.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
class TileInventoryChangeEvent extends TileEvent implements CancellableEvent{
public static $handlers;
public static $handlerPriority;
private $oldItem;
private $newItem;
private $slot;
public function __construct(Tile $tile, Item $oldItem, Item $newItem, $slot){
$this->tile = $tile;
$this->oldItem = $oldItem;
$this->newItem = $newItem;
$this->slot = (int) $slot;
}
public function getSlot(){
return $this->slot;
}
public function getNewItem(){
return $this->newItem;
}
public function setNewItem(Item $item){
$this->newItem = $item;
}
public function getOldItem(){
return $this->oldItem;
}
}

17
src/tile/ContainerTileTrait.php
View File

@ -143,15 +143,20 @@ trait ContainerTileTrait{
public function setSlot($s, Item $item, $update = true, $offset = 0){ public function setSlot($s, Item $item, $update = true, $offset = 0){
$i = $this->getSlotIndex($s); $i = $this->getSlotIndex($s);
if($i === false or EventHandler::callEvent($ev = new TileInventoryChangeEvent($this, $this->getSlot($s), $item, $s, $offset)) === BaseEvent::DENY){
return false;
}
$item = $ev->getNewItem();
$d = new NBTTag_Compound(false, array( $d = new NBTTag_Compound(false, array(
"Count" => new NBTTag_Byte("Count", $item->getCount()), "Count" => new NBTTag_Byte("Count", $item->getCount()),
"Slot" => new NBTTag_Byte("Slot", $s), "Slot" => new NBTTag_Byte("Slot", $s),
"id" => new NBTTag_Short("id", $item->getID()), "id" => new NBTTag_Short("id", $item->getID()),
"Damage" => new NBTTag_Short("Damage", $item->getMetadata()), "Damage" => new NBTTag_Short("Damage", $item->getMetadata()),
)); ));
if($i === false){
return false; if($item->getID() === AIR or $item->getCount() <= 0){
}elseif($item->getID() === AIR or $item->getCount() <= 0){
if($i >= 0){ if($i >= 0){
unset($this->namedtag->Items[$i]); unset($this->namedtag->Items[$i]);
} }
@ -160,12 +165,6 @@ trait ContainerTileTrait{
}else{ }else{
$this->namedtag->Items[$i] = $d; $this->namedtag->Items[$i] = $d;
} }
$this->server->api->dhandle("tile.container.slot", array(
"tile" => $this,
"slot" => $s,
"offset" => $offset,
"slotdata" => $item,
));
if($update === true){ if($update === true){
$this->scheduleUpdate(); $this->scheduleUpdate();