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

Merge branch 'master' of https://github.com/PocketMine/PocketMine-MP

Browse Source
This commit is contained in:
Michael Yoo
2013-11-26 15:15:30 +10:30
parent d2fa06cb64 0e9458fafc
commit 3352c36ba4
3 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Player.php
View File

@@ -802,6 +802,7 @@ class Player{
}
if(is_array($res)){
if($this->server->api->dhandle("player.craft", array("player" => $this, "recipe" => $recipe, "craft" => $craft, "type" => $type)) === false){
return false;
}
@@ -851,6 +852,9 @@ class Player{
case DIAMOND:
AchievementAPI::grantAchievement($this, "diamond");
break;
case CAKE:
$this->addItem(BUCKET, 0, 3, false);
break;
}
}
@@ -1852,7 +1856,7 @@ class Player{
$items = array(
APPLE => 2,
MUSHROOM_STEW => 10,
//BEETROOT_SOUP => ??,
BEETROOT_SOUP => 10,
BREAD => 5,
RAW_PORKCHOP => 3,
COOKED_PORKCHOP => 8,

25
src/world/Explosion.php
View File

@@ -98,7 +98,28 @@ class Explosion{
$e = $server->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);
$server->api->entity->spawnToAll($e);
}elseif(mt_rand(0, 10000) < ((1/$this->size) * 10000)){
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), BlockAPI::getItem($block->getID(), $this->level->level->getBlockDamage($block->x, $block->y, $block->z)));
switch ($block->getID()) {
case GRASS:
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), BlockAPI::getItem(DIRT, $this->level->level->getBlockDamage($block->x, $block->y, $block->z)));
break;
case STONE:
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), BlockAPI::getItem(COBBLESTONE, $this->level->level->getBlockDamage($block->x, $block->y, $block->z)));
break;
case COAL_ORE:
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), new CoalItem());
break;
case DIAMOND_ORE:
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), new DiamondItem());
break;
default:
$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), BlockAPI::getItem($block->getID(), $this->level->level->getBlockDamage($block->x, $block->y, $block->z)));
break;
}
}
$this->level->level->setBlockID($block->x, $block->y, $block->z, 0);
$send[] = new Vector3($block->x - $source->x, $block->y - $source->y, $block->z - $source->z);
@@ -112,4 +133,4 @@ class Explosion{
));
}
}
}