Added Support for 0.14.2. Close iTXTech#867. Close iTXTech#869

celisold · Apr 28, 2016 · eded931 · eded931
1 parent 6d8779e
commit eded931
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
@@ -1421,6 +1421,8 @@ public function sendSettings(){
 
  $pk = new AdventureSettingsPacket();
  $pk->flags = $flags;
+ $pk->userPermission = 2;
+ $pk->globalPermission = 2;
  $this->dataPacket($pk);
  }
 

diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
@@ -75,8 +75,8 @@ function dummy(){
  const VERSION = "1.1dev";
  const API_VERSION = "2.0.0";
  const CODENAME = "Ikaros";
- const MINECRAFT_VERSION = "v0.14.x alpha";
- const MINECRAFT_VERSION_NETWORK = "0.14.1";
+ const MINECRAFT_VERSION = "v0.14.2 alpha";
+ const MINECRAFT_VERSION_NETWORK = "0.14.2";
  const GENISYS_API_VERSION = '1.7.2';
 
  /*

diff --git a/src/pocketmine/network/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/protocol/AdventureSettingsPacket.php
@@ -28,6 +28,8 @@ class AdventureSettingsPacket extends DataPacket{
  const NETWORK_ID = Info::ADVENTURE_SETTINGS_PACKET;
 
  public $flags;
+ public $userPermission;
+ public $globalPermission;
 
  public function decode(){
 
@@ -36,6 +38,8 @@ public function decode(){
  public function encode(){
  $this->reset();
  $this->putInt($this->flags);
+ $this->putInt($this->userPermission);
+ $this->putInt($this->globalPermission);
  }
 
 }
diff --git a/src/pocketmine/network/protocol/Info.php b/src/pocketmine/network/protocol/Info.php
@@ -30,8 +30,8 @@ interface Info{
  /**
  * Actual Minecraft: PE protocol version
  */
- const CURRENT_PROTOCOL = 46;
- const ACCEPTED_PROTOCOLS = [45, 46];
+ const CURRENT_PROTOCOL = 60;
+ const ACCEPTED_PROTOCOLS = [45, 46, 60];
 
  const LOGIN_PACKET = 0x8f;
  const PLAY_STATUS_PACKET = 0x90;

diff --git a/src/pocketmine/network/protocol/StartGamePacket.php b/src/pocketmine/network/protocol/StartGamePacket.php
@@ -38,6 +38,7 @@ class StartGamePacket extends DataPacket{
  public $x;
  public $y;
  public $z;
+ public $unknown;
 
  public function decode(){
 
@@ -56,7 +57,10 @@ public function encode(){
  $this->putFloat($this->x);
  $this->putFloat($this->y);
  $this->putFloat($this->z);
+ $this->putByte(1);
+ $this->putByte(1);
  $this->putByte(0);
+ $this->putString($this->unknown);
  }
 
 }