mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 15:19:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PocketMine/PocketMine-MP

Browse Source
This commit is contained in:
PEMapModder 2016-02-12 14:09:39 +08:00
commit 03c19aefbf
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -75,8 +75,8 @@ namespace pocketmine {
const VERSION = "1.6dev";
const API_VERSION = "1.13.1";
const CODENAME = "[REDACTED]";
const MINECRAFT_VERSION = "v0.13.1 alpha";
const MINECRAFT_VERSION_NETWORK = "0.13.1";
const MINECRAFT_VERSION = "v0.13.2 alpha";
const MINECRAFT_VERSION_NETWORK = "0.13.2";
/*
* Startup code. Do not look at it, it may harm you.

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

@ -73,7 +73,9 @@ class TallGrass extends Flowable{
public function getDrops(Item $item){
if(mt_rand(0, 15) === 0){
return [Item::WHEAT_SEEDS, 0, 1];
return [
[Item::WHEAT_SEEDS, 0, 1]
];
}
return [];

9
src/pocketmine/event/player/PlayerBucketEvent.php
View File

@ -83,4 +83,11 @@ abstract class PlayerBucketEvent extends PlayerEvent implements Cancellable{
public function getBlockClicked(){
return $this->blockClicked;
}
}
/**
* @return int
*/
public function getBlockFace(){
return $this->blockFace;
}
}

2
src/pocketmine/network/protocol/Info.php
View File

@ -30,7 +30,7 @@ interface Info{
/**
* Actual Minecraft: PE protocol version
*/
const CURRENT_PROTOCOL = 38;
const CURRENT_PROTOCOL = 39;
const LOGIN_PACKET = 0x8f;
const PLAY_STATUS_PACKET = 0x90;