MattTheTekie/GladiatorMine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #791

Browse source
This commit is contained in:
PeratX 2016-04-19 21:54:12 +08:00
commit 231c5351c3
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pocketmine/block/Tripwire.php
View file

@ -23,7 +23,7 @@ namespace pocketmine\block;
use pocketmine\item\Tool;
class Tripwire extends Solid{
class Tripwire extends Transparent{
protected $id = self::TRIPWIRE;

7
src/pocketmine/level/Level.php
View file

@ -1595,10 +1595,9 @@ class Level implements ChunkManager, Metadatable{
}
if($player !== null){
if($player->isAdventure() or $player->isSpectator()) return true;
$ev = new BlockBreakEvent($player, $target, $item, $player->isCreative() ? true : false);
if($player->isSurvival() and $item instanceof Item and !$target->isBreakable($item)){
if($player->isAdventure() or $player->isSpectator() or ($player->isSurvival() and $item instanceof Item and !$target->isBreakable($item))){
$ev->setCancelled();
}elseif(!$player->isOp() and ($distance = $this->server->getSpawnRadius()) > -1){
$t = new Vector2($target->x, $target->z);
@ -1777,6 +1776,9 @@ class Level implements ChunkManager, Metadatable{
$ev->setCancelled();
}
}
if($player->isAdventure() or $player->isSpectator()){
$ev->setCancelled();
}
$this->server->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){
$target->onUpdate(self::BLOCK_UPDATE_TOUCH);
@ -1813,7 +1815,6 @@ class Level implements ChunkManager, Metadatable{
}else{
return false;
}
if($player->isAdventure() or $player->isSpectator()) return true;
}elseif($target->canBeActivated() === true and $target->onActivate($item, $player) === true){
return true;
}