mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 03:08:58 +00:00
Code Issues Projects Releases Wiki Activity

Only spawn break particles when needed

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-06-07 12:33:53 +02:00
parent 383fcba8e1
commit d881dbf1a2
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -2197,7 +2197,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$oldItem = clone $item; $oldItem = clone $item;
if($this->canInteract($vector->add(0.5, 0.5, 0.5), 13) and $this->level->useBreakOn($vector, $item, $this) === true){ if($this->canInteract($vector->add(0.5, 0.5, 0.5), 13) and $this->level->useBreakOn($vector, $item, $this, true)){
if($this->isSurvival()){ if($this->isSurvival()){
if(!$item->equals($oldItem, true) or $item->getCount() !== $oldItem->getCount()){ if(!$item->equals($oldItem, true) or $item->getCount() !== $oldItem->getCount()){
$this->inventory->setItemInHand($item, $this); $this->inventory->setItemInHand($item, $this);

29
src/pocketmine/level/Level.php
View File

@ -1422,10 +1422,11 @@ class Level implements ChunkManager, Metadatable{
* @param Vector3 $vector * @param Vector3 $vector
* @param Item &$item (if null, can break anything) * @param Item &$item (if null, can break anything)
* @param Player $player * @param Player $player
* @param bool $createParticles
* *
* @return boolean * @return boolean
*/ */
public function useBreakOn(Vector3 $vector, Item &$item = null, Player $player = null){ public function useBreakOn(Vector3 $vector, Item &$item = null, Player $player = null, $createParticles = false){
$target = $this->getBlock($vector); $target = $this->getBlock($vector);
//TODO: Adventure mode checks //TODO: Adventure mode checks
@ -1452,7 +1453,7 @@ class Level implements ChunkManager, Metadatable{
$breakTime = $player->isCreative() ? 0.15 : $target->getBreakTime($item); $breakTime = $player->isCreative() ? 0.15 : $target->getBreakTime($item);
if($player->hasEffect(Effect::SWIFTNESS)){ if($player->hasEffect(Effect::SWIFTNESS)){
$breakTime *= pow(0.80, $player->getEffect(Effect::SWIFTNESS)->getAmplifier() + 1); $breakTime *= 0.80 * ($player->getEffect(Effect::SWIFTNESS)->getAmplifier() + 1);
} }
if(!$ev->getInstaBreak() and ($player->lastBreak + $breakTime) >= microtime(true)){ if(!$ev->getInstaBreak() and ($player->lastBreak + $breakTime) >= microtime(true)){
@ -1479,18 +1480,20 @@ class Level implements ChunkManager, Metadatable{
} }
} }
$players = $this->getChunkPlayers($target->x >> 4, $target->z >> 4); if($createParticles){
if($player !== null){ $players = $this->getChunkPlayers($target->x >> 4, $target->z >> 4);
unset($players[$player->getLoaderId()]); if($player !== null){
} unset($players[$player->getLoaderId()]);
}
$pk = new LevelEventPacket(); $pk = new LevelEventPacket();
$pk->evid = 2001; $pk->evid = 2001;
$pk->x = $target->x + 0.5; $pk->x = $target->x + 0.5;
$pk->y = $target->y + 0.5; $pk->y = $target->y + 0.5;
$pk->z = $target->z + 0.5; $pk->z = $target->z + 0.5;
$pk->data = $target->getId() + ($target->getDamage() << 12); $pk->data = $target->getId() + ($target->getDamage() << 12);
Server::broadcastPacket($players, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS)); Server::broadcastPacket($players, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
}
$target->onBreak($item); $target->onBreak($item);