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

Improved block breaking time and event handling

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-12-22 23:49:17 +01:00
parent a677bcb331
commit 6cb88afe1a
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1208,16 +1208,10 @@ class Level implements ChunkManager, Metadatable{
if($player instanceof Player){ if($player instanceof Player){
$ev = new BlockBreakEvent($player, $target, $item, ($player->getGamemode() & 0x01) === 1 ? true : false); $ev = new BlockBreakEvent($player, $target, $item, ($player->getGamemode() & 0x01) === 1 ? true : false);
$lastTime = $player->lastBreak - 0.1; //TODO: replace with true lag if($item instanceof Item and !$target->isBreakable($item)){
if(($player->getGamemode() & 0x01) > 0){
$ev->setInstaBreak(true);
}elseif(($lastTime + $target->getBreakTime($item)) >= microtime(true)){
$ev->setCancelled(); $ev->setCancelled();
} }
if($item instanceof Item and !$target->isBreakable($item) and $ev->getInstaBreak() === false){
$ev->setCancelled();
}
if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){ if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){
$t = new Vector2($target->x, $target->z); $t = new Vector2($target->x, $target->z);
$s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z); $s = new Vector2($this->getSpawnLocation()->x, $this->getSpawnLocation()->z);
@ -1230,8 +1224,13 @@ class Level implements ChunkManager, Metadatable{
return false; return false;
} }
$player->lastBreak = microtime(true); $breakTime = $player->isCreative() ? 0.15 : $target->getBreakTime($item);
if(!$ev->getInstaBreak() and ($player->lastBreak + $breakTime) >= microtime(true)){
return false;
}
$player->lastBreak = microtime(true);
}elseif($item instanceof Item and !$target->isBreakable($item)){ }elseif($item instanceof Item and !$target->isBreakable($item)){
return false; return false;
} }