mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Bump version to 1.2.5.12 and protocol changes

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-23 20:04:47 +01:00
parent 0df3b00de4
commit 0072af95cb
3 changed files with 129 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
View File

@ -77,7 +77,7 @@ class ClientboundMapItemDataPacket extends DataPacket{
}
}
if(($this->type & (self::BITFLAG_DECORATION_UPDATE | self::BITFLAG_TEXTURE_UPDATE)) !== 0){ //Decoration bitflag or colour bitflag
if(($this->type & (0x08 | self::BITFLAG_DECORATION_UPDATE | self::BITFLAG_TEXTURE_UPDATE)) !== 0){ //Decoration bitflag or colour bitflag
$this->scale = $this->getByte();
}
@ -138,7 +138,7 @@ class ClientboundMapItemDataPacket extends DataPacket{
}
}
if(($type & (self::BITFLAG_TEXTURE_UPDATE | self::BITFLAG_DECORATION_UPDATE)) !== 0){
if(($type & (0x08 | self::BITFLAG_TEXTURE_UPDATE | self::BITFLAG_DECORATION_UPDATE)) !== 0){
$this->putByte($this->scale);
}

243
src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php
View File

@ -73,125 +73,130 @@ class LevelSoundEventPacket extends DataPacket{
const SOUND_THROW = 39;
const SOUND_ATTACK = 40;
const SOUND_ATTACK_NODAMAGE = 41;
const SOUND_WARN = 42;
const SOUND_SHEAR = 43;
const SOUND_MILK = 44;
const SOUND_THUNDER = 45;
const SOUND_EXPLODE = 46;
const SOUND_FIRE = 47;
const SOUND_IGNITE = 48;
const SOUND_FUSE = 49;
const SOUND_STARE = 50;
const SOUND_SPAWN = 51;
const SOUND_SHOOT = 52;
const SOUND_BREAK_BLOCK = 53;
const SOUND_LAUNCH = 54;
const SOUND_BLAST = 55;
const SOUND_LARGE_BLAST = 56;
const SOUND_TWINKLE = 57;
const SOUND_REMEDY = 58;
const SOUND_UNFECT = 59;
const SOUND_LEVELUP = 60;
const SOUND_BOW_HIT = 61;
const SOUND_BULLET_HIT = 62;
const SOUND_EXTINGUISH_FIRE = 63;
const SOUND_ITEM_FIZZ = 64;
const SOUND_CHEST_OPEN = 65;
const SOUND_CHEST_CLOSED = 66;
const SOUND_SHULKERBOX_OPEN = 67;
const SOUND_SHULKERBOX_CLOSED = 68;
const SOUND_POWER_ON = 69;
const SOUND_POWER_OFF = 70;
const SOUND_ATTACH = 71;
const SOUND_DETACH = 72;
const SOUND_DENY = 73;
const SOUND_TRIPOD = 74;
const SOUND_POP = 75;
const SOUND_DROP_SLOT = 76;
const SOUND_NOTE = 77;
const SOUND_THORNS = 78;
const SOUND_PISTON_IN = 79;
const SOUND_PISTON_OUT = 80;
const SOUND_PORTAL = 81;
const SOUND_WATER = 82;
const SOUND_LAVA_POP = 83;
const SOUND_LAVA = 84;
const SOUND_BURP = 85;
const SOUND_BUCKET_FILL_WATER = 86;
const SOUND_BUCKET_FILL_LAVA = 87;
const SOUND_BUCKET_EMPTY_WATER = 88;
const SOUND_BUCKET_EMPTY_LAVA = 89;
const SOUND_RECORD_13 = 90;
const SOUND_RECORD_CAT = 91;
const SOUND_RECORD_BLOCKS = 92;
const SOUND_RECORD_CHIRP = 93;
const SOUND_RECORD_FAR = 94;
const SOUND_RECORD_MALL = 95;
const SOUND_RECORD_MELLOHI = 96;
const SOUND_RECORD_STAL = 97;
const SOUND_RECORD_STRAD = 98;
const SOUND_RECORD_WARD = 99;
const SOUND_RECORD_11 = 100;
const SOUND_RECORD_WAIT = 101;
const SOUND_GUARDIAN_FLOP = 103;
const SOUND_ELDERGUARDIAN_CURSE = 104;
const SOUND_MOB_WARNING = 105;
const SOUND_MOB_WARNING_BABY = 106;
const SOUND_TELEPORT = 107;
const SOUND_SHULKER_OPEN = 108;
const SOUND_SHULKER_CLOSE = 109;
const SOUND_HAGGLE = 110;
const SOUND_HAGGLE_YES = 111;
const SOUND_HAGGLE_NO = 112;
const SOUND_HAGGLE_IDLE = 113;
const SOUND_CHORUSGROW = 114;
const SOUND_CHORUSDEATH = 115;
const SOUND_GLASS = 116;
const SOUND_CAST_SPELL = 117;
const SOUND_PREPARE_ATTACK = 118;
const SOUND_PREPARE_SUMMON = 119;
const SOUND_PREPARE_WOLOLO = 120;
const SOUND_FANG = 121;
const SOUND_CHARGE = 122;
const SOUND_CAMERA_TAKE_PICTURE = 123;
const SOUND_LEASHKNOT_PLACE = 124;
const SOUND_LEASHKNOT_BREAK = 125;
const SOUND_GROWL = 126;
const SOUND_WHINE = 127;
const SOUND_PANT = 128;
const SOUND_PURR = 129;
const SOUND_PURREOW = 130;
const SOUND_DEATH_MIN_VOLUME = 131;
const SOUND_DEATH_MID_VOLUME = 132;
const SOUND_IMITATE_BLAZE = 133;
const SOUND_IMITATE_CAVE_SPIDER = 134;
const SOUND_IMITATE_CREEPER = 135;
const SOUND_IMITATE_ELDER_GUARDIAN = 136;
const SOUND_IMITATE_ENDER_DRAGON = 137;
const SOUND_IMITATE_ENDERMAN = 138;
const SOUND_IMITATE_EVOCATION_ILLAGER = 140;
const SOUND_IMITATE_GHAST = 141;
const SOUND_IMITATE_HUSK = 142;
const SOUND_IMITATE_ILLUSION_ILLAGER = 143;
const SOUND_IMITATE_MAGMA_CUBE = 144;
const SOUND_IMITATE_POLAR_BEAR = 145;
const SOUND_IMITATE_SHULKER = 146;
const SOUND_IMITATE_SILVERFISH = 147;
const SOUND_IMITATE_SKELETON = 148;
const SOUND_IMITATE_SLIME = 149;
const SOUND_IMITATE_SPIDER = 150;
const SOUND_IMITATE_STRAY = 151;
const SOUND_IMITATE_VEX = 152;
const SOUND_IMITATE_VINDICATION_ILLAGER = 153;
const SOUND_IMITATE_WITCH = 154;
const SOUND_IMITATE_WITHER = 155;
const SOUND_IMITATE_WITHER_SKELETON = 156;
const SOUND_IMITATE_WOLF = 157;
const SOUND_IMITATE_ZOMBIE = 158;
const SOUND_IMITATE_ZOMBIE_PIGMAN = 159;
const SOUND_IMITATE_ZOMBIE_VILLAGER = 160;
const SOUND_DEFAULT = 161;
const SOUND_UNDEFINED = 162;
const SOUND_ATTACK_STRONG = 42;
const SOUND_WARN = 43;
const SOUND_SHEAR = 44;
const SOUND_MILK = 45;
const SOUND_THUNDER = 46;
const SOUND_EXPLODE = 47;
const SOUND_FIRE = 48;
const SOUND_IGNITE = 49;
const SOUND_FUSE = 50;
const SOUND_STARE = 51;
const SOUND_SPAWN = 52;
const SOUND_SHOOT = 53;
const SOUND_BREAK_BLOCK = 54;
const SOUND_LAUNCH = 55;
const SOUND_BLAST = 56;
const SOUND_LARGE_BLAST = 57;
const SOUND_TWINKLE = 58;
const SOUND_REMEDY = 59;
const SOUND_UNFECT = 60;
const SOUND_LEVELUP = 61;
const SOUND_BOW_HIT = 62;
const SOUND_BULLET_HIT = 63;
const SOUND_EXTINGUISH_FIRE = 64;
const SOUND_ITEM_FIZZ = 65;
const SOUND_CHEST_OPEN = 66;
const SOUND_CHEST_CLOSED = 67;
const SOUND_SHULKERBOX_OPEN = 68;
const SOUND_SHULKERBOX_CLOSED = 69;
const SOUND_POWER_ON = 70;
const SOUND_POWER_OFF = 71;
const SOUND_ATTACH = 72;
const SOUND_DETACH = 73;
const SOUND_DENY = 74;
const SOUND_TRIPOD = 75;
const SOUND_POP = 76;
const SOUND_DROP_SLOT = 77;
const SOUND_NOTE = 78;
const SOUND_THORNS = 79;
const SOUND_PISTON_IN = 80;
const SOUND_PISTON_OUT = 81;
const SOUND_PORTAL = 82;
const SOUND_WATER = 83;
const SOUND_LAVA_POP = 84;
const SOUND_LAVA = 85;
const SOUND_BURP = 86;
const SOUND_BUCKET_FILL_WATER = 87;
const SOUND_BUCKET_FILL_LAVA = 88;
const SOUND_BUCKET_EMPTY_WATER = 89;
const SOUND_BUCKET_EMPTY_LAVA = 90;
const SOUND_RECORD_13 = 91;
const SOUND_RECORD_CAT = 92;
const SOUND_RECORD_BLOCKS = 93;
const SOUND_RECORD_CHIRP = 94;
const SOUND_RECORD_FAR = 95;
const SOUND_RECORD_MALL = 96;
const SOUND_RECORD_MELLOHI = 97;
const SOUND_RECORD_STAL = 98;
const SOUND_RECORD_STRAD = 99;
const SOUND_RECORD_WARD = 100;
const SOUND_RECORD_11 = 101;
const SOUND_RECORD_WAIT = 102;
const SOUND_GUARDIAN_FLOP = 104;
const SOUND_ELDERGUARDIAN_CURSE = 105;
const SOUND_MOB_WARNING = 106;
const SOUND_MOB_WARNING_BABY = 107;
const SOUND_TELEPORT = 108;
const SOUND_SHULKER_OPEN = 109;
const SOUND_SHULKER_CLOSE = 110;
const SOUND_HAGGLE = 111;
const SOUND_HAGGLE_YES = 112;
const SOUND_HAGGLE_NO = 113;
const SOUND_HAGGLE_IDLE = 114;
const SOUND_CHORUSGROW = 115;
const SOUND_CHORUSDEATH = 116;
const SOUND_GLASS = 117;
const SOUND_CAST_SPELL = 118;
const SOUND_PREPARE_ATTACK = 119;
const SOUND_PREPARE_SUMMON = 120;
const SOUND_PREPARE_WOLOLO = 121;
const SOUND_FANG = 122;
const SOUND_CHARGE = 123;
const SOUND_CAMERA_TAKE_PICTURE = 124;
const SOUND_LEASHKNOT_PLACE = 125;
const SOUND_LEASHKNOT_BREAK = 126;
const SOUND_GROWL = 127;
const SOUND_WHINE = 128;
const SOUND_PANT = 129;
const SOUND_PURR = 130;
const SOUND_PURREOW = 131;
const SOUND_DEATH_MIN_VOLUME = 132;
const SOUND_DEATH_MID_VOLUME = 133;
const SOUND_IMITATE_BLAZE = 134;
const SOUND_IMITATE_CAVE_SPIDER = 135;
const SOUND_IMITATE_CREEPER = 136;
const SOUND_IMITATE_ELDER_GUARDIAN = 137;
const SOUND_IMITATE_ENDER_DRAGON = 138;
const SOUND_IMITATE_ENDERMAN = 139;
const SOUND_IMITATE_EVOCATION_ILLAGER = 141;
const SOUND_IMITATE_GHAST = 142;
const SOUND_IMITATE_HUSK = 143;
const SOUND_IMITATE_ILLUSION_ILLAGER = 144;
const SOUND_IMITATE_MAGMA_CUBE = 145;
const SOUND_IMITATE_POLAR_BEAR = 146;
const SOUND_IMITATE_SHULKER = 147;
const SOUND_IMITATE_SILVERFISH = 148;
const SOUND_IMITATE_SKELETON = 149;
const SOUND_IMITATE_SLIME = 150;
const SOUND_IMITATE_SPIDER = 151;
const SOUND_IMITATE_STRAY = 152;
const SOUND_IMITATE_VEX = 153;
const SOUND_IMITATE_VINDICATION_ILLAGER = 154;
const SOUND_IMITATE_WITCH = 155;
const SOUND_IMITATE_WITHER = 156;
const SOUND_IMITATE_WITHER_SKELETON = 157;
const SOUND_IMITATE_WOLF = 158;
const SOUND_IMITATE_ZOMBIE = 159;
const SOUND_IMITATE_ZOMBIE_PIGMAN = 160;
const SOUND_IMITATE_ZOMBIE_VILLAGER = 161;
const SOUND_BLOCK_END_PORTAL_FRAME_FILL = 162;
const SOUND_BLOCK_END_PORTAL_SPAWN = 163;
const SOUND_RANDOM_ANVIL_USE = 164;
const SOUND_BOTTLE_DRAGONBREATH = 165;
const SOUND_DEFAULT = 166;
const SOUND_UNDEFINED = 167;
/** @var int */
public $sound;

6
src/pocketmine/network/mcpe/protocol/ProtocolInfo.php
View File

@ -39,15 +39,15 @@ interface ProtocolInfo{
/**
* Actual Minecraft: PE protocol version
*/
const CURRENT_PROTOCOL = 137;
const CURRENT_PROTOCOL = 140;
/**
* Current Minecraft PE version reported by the server. This is usually the earliest currently supported version.
*/
const MINECRAFT_VERSION = 'v1.2.0.81';
const MINECRAFT_VERSION = 'v1.2.5.12 beta';
/**
* Version number sent to clients in ping responses.
*/
const MINECRAFT_VERSION_NETWORK = '1.2.0.81';
const MINECRAFT_VERSION_NETWORK = '1.2.5.12';
const LOGIN_PACKET = 0x01;
const PLAY_STATUS_PACKET = 0x02;