mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 20:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-04-16 18:26:33 +01:00
commit 8d2ee516f0
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/mcpe/convert/TypeConverter.php
View File

@ -139,7 +139,7 @@ class TypeConverter{
$nbt = clone $itemStack->getNamedTag(); $nbt = clone $itemStack->getNamedTag();
} }
$block = $itemStack->getBlock(); $isBlockItem = $itemStack->getId() < 256;
if($itemStack instanceof Durable and $itemStack->getDamage() > 0){ if($itemStack instanceof Durable and $itemStack->getDamage() > 0){
if($nbt !== null){ if($nbt !== null){
if(($existing = $nbt->getTag(self::DAMAGE_TAG)) !== null){ if(($existing = $nbt->getTag(self::DAMAGE_TAG)) !== null){
@ -150,7 +150,7 @@ class TypeConverter{
$nbt = new CompoundTag(); $nbt = new CompoundTag();
} }
$nbt->setInt(self::DAMAGE_TAG, $itemStack->getDamage()); $nbt->setInt(self::DAMAGE_TAG, $itemStack->getDamage());
}elseif($block->getId() !== BlockLegacyIds::AIR && $itemStack->getMeta() !== 0){ }elseif($isBlockItem && $itemStack->getMeta() !== 0){
//TODO HACK: This foul-smelling code ensures that we can correctly deserialize an item when the //TODO HACK: This foul-smelling code ensures that we can correctly deserialize an item when the
//client sends it back to us, because as of 1.16.220, blockitems quietly discard their metadata //client sends it back to us, because as of 1.16.220, blockitems quietly discard their metadata
//client-side. Aside from being very annoying, this also breaks various server-side behaviours. //client-side. Aside from being very annoying, this also breaks various server-side behaviours.
@ -161,7 +161,13 @@ class TypeConverter{
} }
[$id, $meta] = ItemTranslator::getInstance()->toNetworkId($itemStack->getId(), $itemStack->getMeta()); [$id, $meta] = ItemTranslator::getInstance()->toNetworkId($itemStack->getId(), $itemStack->getMeta());
$blockRuntimeId = $block->getId() === BlockLegacyIds::AIR ? 0 : RuntimeBlockMapping::getInstance()->toRuntimeId($block->getFullId()); $blockRuntimeId = 0;
if($isBlockItem){
$block = $itemStack->getBlock();
if($block->getId() !== BlockLegacyIds::AIR){
$blockRuntimeId = RuntimeBlockMapping::getInstance()->toRuntimeId($block->getFullId());
}
}
return new ItemStack( return new ItemStack(
$id, $id,

92
src/network/mcpe/protocol/types/ParticleIds.php
View File

@ -28,7 +28,6 @@ final class ParticleIds{
private function __construct(){ private function __construct(){
//NOOP //NOOP
} }
public const BUBBLE = 1; public const BUBBLE = 1;
public const BUBBLE_MANUAL = 2; public const BUBBLE_MANUAL = 2;
public const CRITICAL = 3; public const CRITICAL = 3;
@ -57,44 +56,57 @@ final class ParticleIds{
public const DRIP_WATER = 26; public const DRIP_WATER = 26;
public const DRIP_LAVA = 27; public const DRIP_LAVA = 27;
public const DRIP_HONEY = 28; public const DRIP_HONEY = 28;
public const FALLING_DUST = 29, DUST = 29; public const STALACTITE_DRIP_WATER = 29;
public const MOB_SPELL = 30; public const STALACTITE_DRIP_LAVA = 30;
public const MOB_SPELL_AMBIENT = 31; public const FALLING_DUST = 31, DUST = 31;
public const MOB_SPELL_INSTANTANEOUS = 32; public const MOB_SPELL = 32;
public const INK = 33; public const MOB_SPELL_AMBIENT = 33;
public const SLIME = 34; public const MOB_SPELL_INSTANTANEOUS = 34;
public const RAIN_SPLASH = 35; public const INK = 35;
public const VILLAGER_ANGRY = 36; public const SLIME = 36;
public const VILLAGER_HAPPY = 37; public const RAIN_SPLASH = 37;
public const ENCHANTMENT_TABLE = 38; public const VILLAGER_ANGRY = 38;
public const TRACKING_EMITTER = 39; public const VILLAGER_HAPPY = 39;
public const NOTE = 40; public const ENCHANTMENT_TABLE = 40;
public const WITCH_SPELL = 41; public const TRACKING_EMITTER = 41;
public const CARROT = 42; public const NOTE = 42;
public const MOB_APPEARANCE = 43; public const WITCH_SPELL = 43;
public const END_ROD = 44; public const CARROT = 44;
public const DRAGONS_BREATH = 45; public const MOB_APPEARANCE = 45;
public const SPIT = 46; public const END_ROD = 46;
public const TOTEM = 47; public const DRAGONS_BREATH = 47;
public const FOOD = 48; public const SPIT = 48;
public const FIREWORKS_STARTER = 49; public const TOTEM = 49;
public const FIREWORKS_SPARK = 50; public const FOOD = 50;
public const FIREWORKS_OVERLAY = 51; public const FIREWORKS_STARTER = 51;
public const BALLOON_GAS = 52; public const FIREWORKS_SPARK = 52;
public const COLORED_FLAME = 53; public const FIREWORKS_OVERLAY = 53;
public const SPARKLER = 54; public const BALLOON_GAS = 54;
public const CONDUIT = 55; public const COLORED_FLAME = 55;
public const BUBBLE_COLUMN_UP = 56; public const SPARKLER = 56;
public const BUBBLE_COLUMN_DOWN = 57; public const CONDUIT = 57;
public const SNEEZE = 58; public const BUBBLE_COLUMN_UP = 58;
public const SHULKER_BULLET = 59; public const BUBBLE_COLUMN_DOWN = 59;
public const BLEACH = 60; public const SNEEZE = 60;
public const DRAGON_DESTROY_BLOCK = 61; public const SHULKER_BULLET = 61;
public const MYCELIUM_DUST = 62; public const BLEACH = 62;
public const FALLING_RED_DUST = 63; public const DRAGON_DESTROY_BLOCK = 63;
public const CAMPFIRE_SMOKE = 64; public const MYCELIUM_DUST = 64;
public const TALL_CAMPFIRE_SMOKE = 65; public const FALLING_RED_DUST = 65;
public const DRAGON_BREATH_FIRE = 66; public const CAMPFIRE_SMOKE = 66;
public const DRAGON_BREATH_TRAIL = 67; public const TALL_CAMPFIRE_SMOKE = 67;
public const DRAGON_BREATH_FIRE = 68;
public const DRAGON_BREATH_TRAIL = 69;
public const BLUE_FLAME = 70;
public const SOUL = 71;
public const OBSIDIAN_TEAR = 72;
public const PORTAL_REVERSE = 73;
public const SNOWFLAKE = 74;
public const VIBRATION_SIGNAL = 75;
public const SCULK_SENSOR_REDSTONE = 76;
public const SPORE_BLOSSOM_SHOWER = 77;
public const SPORE_BLOSSOM_AMBIENT = 78;
public const WAX = 79;
public const ELECTRIC_SPARK = 80;
} }