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

Merge commit 'e80ad22702f87f4a006ab16af3b46baae0490856' into master

Browse Source 
# Conflicts:
#	build/php
#	resources/vanilla
#	src/pocketmine/Player.php
#	tests/plugins/DevTools
This commit is contained in:
Dylan K. Taylor 2020-08-21 21:39:17 +01:00
commit ebd20f997d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -3,6 +3,7 @@ language: php
php: php:
- 7.3 - 7.3
- 7.4
before_script: before_script:
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
@ -26,7 +27,7 @@ before_script:
- pecl install channel://pecl.php.net/igbinary-3.1.2 - pecl install channel://pecl.php.net/igbinary-3.1.2
- git clone https://github.com/pmmp/pthreads.git - git clone https://github.com/pmmp/pthreads.git
- cd pthreads - cd pthreads
- git checkout 45579e1e622acd80f9c880f3a025ba3b98b8ebef - git checkout e0f514dfde01c5e7e9cf94c43615918af482a45c
- phpize - phpize
- ./configure - ./configure
- make - make

3
src/player/Player.php
View File

@ -1562,6 +1562,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$target = $this->getWorld()->getBlock($pos); $target = $this->getWorld()->getBlock($pos);
$ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $face, PlayerInteractEvent::LEFT_CLICK_BLOCK); $ev = new PlayerInteractEvent($this, $this->inventory->getItemInHand(), $target, null, $face, PlayerInteractEvent::LEFT_CLICK_BLOCK);
if($this->isSpectator()){
$ev->setCancelled();
}
$ev->call(); $ev->call();
if($ev->isCancelled()){ if($ev->isCancelled()){
return false; return false;