diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 9e1a74342..5a6dd94d4 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -75,8 +75,8 @@ namespace pocketmine { const VERSION = "1.6dev"; const API_VERSION = "2.0.1"; const CODENAME = "Unleashed"; - const MINECRAFT_VERSION = "v0.15.90.7 alpha"; - const MINECRAFT_VERSION_NETWORK = "0.15.90.7"; + const MINECRAFT_VERSION = "v0.15.90.8 alpha"; + const MINECRAFT_VERSION_NETWORK = "0.15.90.8"; /* * Startup code. Do not look at it, it may harm you. diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index 6cb10f2cf..7b1859a58 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -344,7 +344,7 @@ class Network{ $this->registerPacket(ProtocolInfo::SET_ENTITY_LINK_PACKET, SetEntityLinkPacket::class); $this->registerPacket(ProtocolInfo::SET_ENTITY_MOTION_PACKET, SetEntityMotionPacket::class); $this->registerPacket(ProtocolInfo::SET_HEALTH_PACKET, SetHealthPacket::class); - $this->registerPacket(ProtocolInfo::SET_PLAYER_GAMETYPE_PACKET, SetPlayerGameTypePacket::class); + $this->registerPacket(ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET, SetPlayerGameTypePacket::class); $this->registerPacket(ProtocolInfo::SET_SPAWN_POSITION_PACKET, SetSpawnPositionPacket::class); $this->registerPacket(ProtocolInfo::SET_TIME_PACKET, SetTimePacket::class); $this->registerPacket(ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET, SpawnExperienceOrbPacket::class); diff --git a/src/pocketmine/network/protocol/Info.php b/src/pocketmine/network/protocol/Info.php index c3f968da4..2726e0cc2 100644 --- a/src/pocketmine/network/protocol/Info.php +++ b/src/pocketmine/network/protocol/Info.php @@ -38,73 +38,79 @@ interface Info{ const CLIENT_TO_SERVER_HANDSHAKE_PACKET = 0x04; const DISCONNECT_PACKET = 0x05; const BATCH_PACKET = 0x06; - const TEXT_PACKET = 0x07; - const SET_TIME_PACKET = 0x08; - const START_GAME_PACKET = 0x09; - const ADD_PLAYER_PACKET = 0x0a; - const ADD_ENTITY_PACKET = 0x0b; - const REMOVE_ENTITY_PACKET = 0x0c; - const ADD_ITEM_ENTITY_PACKET = 0x0d; - const ADD_HANGING_ENTITY_PACKET = 0x0e; - const TAKE_ITEM_ENTITY_PACKET = 0x0f; - const MOVE_ENTITY_PACKET = 0x10; - const MOVE_PLAYER_PACKET = 0x11; - const RIDER_JUMP_PACKET = 0x12; - const REMOVE_BLOCK_PACKET = 0x13; - const UPDATE_BLOCK_PACKET = 0x14; - const ADD_PAINTING_PACKET = 0x15; - const EXPLODE_PACKET = 0x16; - const LEVEL_SOUND_EVENT_PACKET = 0x17; - const LEVEL_EVENT_PACKET = 0x18; - const BLOCK_EVENT_PACKET = 0x19; - const ENTITY_EVENT_PACKET = 0x1a; - const MOB_EFFECT_PACKET = 0x1b; - const UPDATE_ATTRIBUTES_PACKET = 0x1c; - const MOB_EQUIPMENT_PACKET = 0x1d; - const MOB_ARMOR_EQUIPMENT_PACKET = 0x1e; - const INTERACT_PACKET = 0x1f; - const USE_ITEM_PACKET = 0x20; - const PLAYER_ACTION_PACKET = 0x21; - const HURT_ARMOR_PACKET = 0x22; - const SET_ENTITY_DATA_PACKET = 0x23; - const SET_ENTITY_MOTION_PACKET = 0x24; - const SET_ENTITY_LINK_PACKET = 0x25; - const SET_HEALTH_PACKET = 0x26; - const SET_SPAWN_POSITION_PACKET = 0x27; - const ANIMATE_PACKET = 0x28; - const RESPAWN_PACKET = 0x29; - const DROP_ITEM_PACKET = 0x2a; - const INVENTORY_ACTION_PACKET = 0x2b; - const CONTAINER_OPEN_PACKET = 0x2c; - const CONTAINER_CLOSE_PACKET = 0x2d; - const CONTAINER_SET_SLOT_PACKET = 0x2e; - const CONTAINER_SET_DATA_PACKET = 0x2f; - const CONTAINER_SET_CONTENT_PACKET = 0x30; - const CRAFTING_DATA_PACKET = 0x31; - const CRAFTING_EVENT_PACKET = 0x32; - const ADVENTURE_SETTINGS_PACKET = 0x33; - const BLOCK_ENTITY_DATA_PACKET = 0x34; - const PLAYER_INPUT_PACKET = 0x35; - const FULL_CHUNK_DATA_PACKET = 0x36; - const SET_COMMANDS_ENABLED_PACKET = 0x37; - const SET_DIFFICULTY_PACKET = 0x38; - const CHANGE_DIMENSION_PACKET = 0x39; - const SET_PLAYER_GAMETYPE_PACKET = 0x3a; - const PLAYER_LIST_PACKET = 0x3b; - const TELEMETRY_EVENT_PACKET = 0x3c; - const SPAWN_EXPERIENCE_ORB_PACKET = 0x3d; - const CLIENTBOUND_MAP_ITEM_DATA_PACKET = 0x3e; - const MAP_INFO_REQUEST_PACKET = 0x3f; - const REQUEST_CHUNK_RADIUS_PACKET = 0x40; - const CHUNK_RADIUS_UPDATED_PACKET = 0x41; - const ITEM_FRAME_DROP_ITEM_PACKET = 0x42; - const REPLACE_SELECTED_ITEM_PACKET = 0x43; - const GAME_RULES_CHANGED_PACKET = 0x44; - const CAMERA_PACKET = 0x45; - const ADD_ITEM_PACKET = 0x46; - const BOSS_EVENT_PACKET = 0x47; - const AVAILABLE_COMMANDS_PACKET = 0x48; - const COMMAND_STEP_PACKET = 0x49; + const RESOURCE_PACKS_INFO_PACKET = 0x07; + const RESOURCE_PACK_STACK_PACKET = 0x08; + const RESOURCE_PACK_CLIENT_RESPONSE_PACKET = 0x09; + const TEXT_PACKET = 0x0a; + const SET_TIME_PACKET = 0x0b; + const START_GAME_PACKET = 0x0c; + const ADD_PLAYER_PACKET = 0x0d; + const ADD_ENTITY_PACKET = 0x0e; + const REMOVE_ENTITY_PACKET = 0x0f; + const ADD_ITEM_ENTITY_PACKET = 0x10; + const ADD_HANGING_ENTITY_PACKET = 0x11; + const TAKE_ITEM_ENTITY_PACKET = 0x12; + const MOVE_ENTITY_PACKET = 0x13; + const MOVE_PLAYER_PACKET = 0x14; + const RIDER_JUMP_PACKET = 0x15; + const REMOVE_BLOCK_PACKET = 0x16; + const UPDATE_BLOCK_PACKET = 0x17; + const ADD_PAINTING_PACKET = 0x18; + const EXPLODE_PACKET = 0x19; + const LEVEL_SOUND_EVENT_PACKET = 0x1a; + const LEVEL_EVENT_PACKET = 0x1b; + const BLOCK_EVENT_PACKET = 0x1c; + const ENTITY_EVENT_PACKET = 0x1d; + const MOB_EFFECT_PACKET = 0x1e; + const UPDATE_ATTRIBUTES_PACKET = 0x1f; + const MOB_EQUIPMENT_PACKET = 0x20; + const MOB_ARMOR_EQUIPMENT_PACKET = 0x21; + const INTERACT_PACKET = 0x22; + const USE_ITEM_PACKET = 0x23; + const PLAYER_ACTION_PACKET = 0x24; + const HURT_ARMOR_PACKET = 0x25; + const SET_ENTITY_DATA_PACKET = 0x26; + const SET_ENTITY_MOTION_PACKET = 0x27; + const SET_ENTITY_LINK_PACKET = 0x28; + const SET_HEALTH_PACKET = 0x29; + const SET_SPAWN_POSITION_PACKET = 0x2a; + const ANIMATE_PACKET = 0x2b; + const RESPAWN_PACKET = 0x2c; + const DROP_ITEM_PACKET = 0x2d; + const INVENTORY_ACTION_PACKET = 0x2e; + const CONTAINER_OPEN_PACKET = 0x2f; + const CONTAINER_CLOSE_PACKET = 0x30; + const CONTAINER_SET_SLOT_PACKET = 0x31; + const CONTAINER_SET_DATA_PACKET = 0x32; + const CONTAINER_SET_CONTENT_PACKET = 0x33; + const CRAFTING_DATA_PACKET = 0x34; + const CRAFTING_EVENT_PACKET = 0x35; + const ADVENTURE_SETTINGS_PACKET = 0x36; + const BLOCK_ENTITY_DATA_PACKET = 0x37; + const PLAYER_INPUT_PACKET = 0x38; + const FULL_CHUNK_DATA_PACKET = 0x39; + const SET_COMMANDS_ENABLED_PACKET = 0x3a; + const SET_DIFFICULTY_PACKET = 0x3b; + const CHANGE_DIMENSION_PACKET = 0x3c; + const SET_PLAYER_GAME_TYPE_PACKET = 0x3d; + const PLAYER_LIST_PACKET = 0x3e; + const EVENT_PACKET = 0x3f; + const SPAWN_EXPERIENCE_ORB_PACKET = 0x40; + const CLIENTBOUND_MAP_ITEM_DATA_PACKET = 0x41; + const MAP_INFO_REQUEST_PACKET = 0x42; + const REQUEST_CHUNK_RADIUS_PACKET = 0x43; + const CHUNK_RADIUS_UPDATED_PACKET = 0x44; + const ITEM_FRAME_DROP_ITEM_PACKET = 0x45; + const REPLACE_SELECTED_ITEM_PACKET = 0x46; + const GAME_RULES_CHANGED_PACKET = 0x47; + const CAMERA_PACKET = 0x48; + const ADD_ITEM_PACKET = 0x49; + const BOSS_EVENT_PACKET = 0x4a; + const AVAILABLE_COMMANDS_PACKET = 0x4b; + const COMMAND_STEP_PACKET = 0x4c; + const RESOURCE_PACK_DATA_INFO_PACKET = 0x4d; + const RESOURCE_PACK_CHUNK_DATA_PACKET = 0x4e; + const RESOURCE_PACK_CHUNK_REQUEST_PACKET = 0x4f; } diff --git a/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php index 98cde80d7..39f1a57ec 100644 --- a/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php +++ b/src/pocketmine/network/protocol/SetPlayerGameTypePacket.php @@ -25,7 +25,7 @@ namespace pocketmine\network\protocol; class SetPlayerGameTypePacket extends DataPacket{ - const NETWORK_ID = Info::SET_PLAYER_GAMETYPE_PACKET; + const NETWORK_ID = Info::SET_PLAYER_GAME_TYPE_PACKET; public $gamemode;