mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 01:39:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'api3/network' into api3/network-mcpe-1.1

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-15 10:30:02 +01:00
commit b55929b382
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -2714,7 +2714,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
}else{ }else{
$this->setSprinting(true); $this->setSprinting(true);
} }
break; return true;
case PlayerActionPacket::ACTION_STOP_SPRINT: case PlayerActionPacket::ACTION_STOP_SPRINT:
$ev = new PlayerToggleSprintEvent($this, false); $ev = new PlayerToggleSprintEvent($this, false);
$this->server->getPluginManager()->callEvent($ev); $this->server->getPluginManager()->callEvent($ev);
@ -2723,7 +2723,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
}else{ }else{
$this->setSprinting(false); $this->setSprinting(false);
} }
break; return true;
case PlayerActionPacket::ACTION_START_SNEAK: case PlayerActionPacket::ACTION_START_SNEAK:
$ev = new PlayerToggleSneakEvent($this, true); $ev = new PlayerToggleSneakEvent($this, true);
$this->server->getPluginManager()->callEvent($ev); $this->server->getPluginManager()->callEvent($ev);

4
src/pocketmine/block/Furnace.php
View File

@ -29,4 +29,8 @@ class Furnace extends BurningFurnace{
public function getName(){ public function getName(){
return "Furnace"; return "Furnace";
} }
public function getLightLevel(){
return 0;
}
} }

2
src/pocketmine/level/sound/PopSound.php
View File

@ -26,6 +26,6 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
class PopSound extends GenericSound{ class PopSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){
parent::__construct($pos, LevelEventPacket::EVENT_SOUND_CLICK_FAIL, $pitch); parent::__construct($pos, LevelEventPacket::EVENT_SOUND_POP, $pitch);
} }
} }