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

Merge branch 'php/7.0' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-03 15:02:41 +01:00
parent f077ba4748 815c697767
commit 78d49f8e66
16 changed files with 108 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/pocketmine/item/BlazeRod.php Normal file
View File

@ -0,0 +1,36 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\item;
class BlazeRod extends Item{
public function __construct(int $meta = 0){
parent::__construct(self::BLAZE_ROD, $meta, "Blaze Rod");
}
public function getFuelTime() : int{
return 2400;
}
}

8
src/pocketmine/item/Bow.php
View File

@ -54,6 +54,8 @@ class Bow extends Tool{
return false;
}
$directionVector = $player->getDirectionVector();
$nbt = new CompoundTag("", [
new ListTag("Pos", [
new DoubleTag("", $player->x),
@ -61,9 +63,9 @@ class Bow extends Tool{
new DoubleTag("", $player->z)
]),
new ListTag("Motion", [
new DoubleTag("", -sin($player->yaw / 180 * M_PI) * cos($player->pitch / 180 * M_PI)),
new DoubleTag("", -sin($player->pitch / 180 * M_PI)),
new DoubleTag("", cos($player->yaw / 180 * M_PI) * cos($player->pitch / 180 * M_PI))
new DoubleTag("", $directionVector->x),
new DoubleTag("", $directionVector->y),
new DoubleTag("", $directionVector->z)
]),
new ListTag("Rotation", [
//yaw/pitch for arrows taken crosswise, not along the arrow shaft.

20
src/pocketmine/item/Bucket.php
View File

@ -51,13 +51,13 @@ class Bucket extends Item{
}
public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
$targetBlock = BlockFactory::get($this->meta);
$resultBlock = BlockFactory::get($this->meta);
if($targetBlock instanceof Air){
if($resultBlock instanceof Air){
if($target instanceof Liquid and $target->getDamage() === 0){
$result = clone $this;
$result->setDamage($target->getId());
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $block, $face, $this, $result));
$resultItem = clone $this;
$resultItem->setDamage($target->getId());
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $block, $face, $this, $resultItem));
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($target, BlockFactory::get(Block::AIR), true, true);
if($player->isSurvival()){
@ -68,12 +68,12 @@ class Bucket extends Item{
$player->getInventory()->sendContents($player);
}
}
}elseif($targetBlock instanceof Liquid){
$result = clone $this;
$result->setDamage(0);
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $block, $face, $this, $result));
}elseif($resultBlock instanceof Liquid){
$resultItem = clone $this;
$resultItem->setDamage(0);
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $block, $face, $this, $resultItem));
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($block, $targetBlock, true, true);
$player->getLevel()->setBlock($block, $resultBlock, true, true);
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
}

12
src/pocketmine/item/ItemFactory.php
View File

@ -150,8 +150,8 @@ class ItemFactory{
self::registerItem(new CookedChicken());
//TODO: ROTTEN_FLESH
//TODO: ENDER_PEARL
//TODO: BLAZE_ROD
//TODO: GHAST_TEAR
self::registerItem(new BlazeRod());
self::registerItem(new Item(Item::GHAST_TEAR, 0, "Ghast Tear"));
self::registerItem(new Item(Item::GOLD_NUGGET, 0, "Gold Nugget"));
self::registerItem(new NetherWart());
self::registerItem(new Potion());
@ -193,7 +193,7 @@ class ItemFactory{
//TODO: RABBIT
self::registerItem(new CookedRabbit());
//TODO: RABBIT_STEW
//TODO: RABBIT_FOOT
self::registerItem(new Item(Item::RABBIT_FOOT, 0, "Rabbit's Foot"));
//TODO: RABBIT_HIDE
//TODO: HORSEARMORLEATHER
//TODO: HORSEARMORIRON
@ -212,7 +212,7 @@ class ItemFactory{
//TODO: ACACIA_DOOR
//TODO: DARK_OAK_DOOR
//TODO: CHORUS_FRUIT
//TODO: CHORUS_FRUIT_POPPED
self::registerItem(new Item(Item::CHORUS_FRUIT_POPPED, 0, "Popped Chorus Fruit"));
//TODO: DRAGON_BREATH
//TODO: SPLASH_POTION
@ -221,11 +221,11 @@ class ItemFactory{
//TODO: COMMAND_BLOCK_MINECART
//TODO: ELYTRA
//TODO: SHULKER_SHELL
self::registerItem(new Item(Item::SHULKER_SHELL, 0, "Shulker Shell"));
//TODO: TOTEM
//TODO: IRON_NUGGET
self::registerItem(new Item(Item::IRON_NUGGET, 0, "Iron Nugget"));
self::registerItem(new Beetroot());
self::registerItem(new BeetrootSeeds());

2
src/pocketmine/item/Stick.php
View File

@ -30,7 +30,7 @@ class Stick extends Item{
}
public function getFuelTime() : int{
return 5;
return 100;
}
}