mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 00:39:45 +00:00
Code Issues Projects Releases Wiki Activity

Fixed "wood" collision

Browse Source 
why the fuck Mojang...
This commit is contained in:
Dylan K. Taylor 2019-03-23 19:08:17 +00:00
parent e088da320c
commit 06a37cc462
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,8 +392,8 @@ class BlockFactory{
//TODO: find a better way to deal with this split //TODO: find a better way to deal with this split
self::register(new Leaves(new BID($magicNumber >= 4 ? Block::LEAVES2 : Block::LEAVES, $magicNumber & 0x03), $name . " Leaves", $treeType)); self::register(new Leaves(new BID($magicNumber >= 4 ? Block::LEAVES2 : Block::LEAVES, $magicNumber & 0x03), $name . " Leaves", $treeType));
self::register(new Log(new BID($magicNumber >= 4 ? Block::WOOD2 : Block::WOOD, $magicNumber & 0x03), $name . " Log", $treeType)); self::register(new Log(new BID($magicNumber >= 4 ? Block::LOG2 : Block::LOG, $magicNumber & 0x03), $name . " Log", $treeType));
self::register(new Wood(new BID($magicNumber >= 4 ? Block::WOOD2 : Block::WOOD, ($magicNumber & 0x03) | 0b1100), $name . " Wood", $treeType)); self::register(new Wood(new BID($magicNumber >= 4 ? Block::LOG2 : Block::LOG, ($magicNumber & 0x03) | 0b1100), $name . " Wood", $treeType));
self::register(new FenceGate(new BID($fenceGateIds[$treeType]), $treeType->getDisplayName() . " Fence Gate")); self::register(new FenceGate(new BID($fenceGateIds[$treeType]), $treeType->getDisplayName() . " Fence Gate"));
self::register(new WoodenStairs(new BID($woodenStairIds[$treeType]), $treeType->getDisplayName() . " Stairs")); self::register(new WoodenStairs(new BID($woodenStairIds[$treeType]), $treeType->getDisplayName() . " Stairs"));

6
src/pocketmine/block/BlockIds.php
View File

@ -42,7 +42,7 @@ interface BlockIds{
public const GOLD_ORE = 14; public const GOLD_ORE = 14;
public const IRON_ORE = 15; public const IRON_ORE = 15;
public const COAL_ORE = 16; public const COAL_ORE = 16;
public const LOG = 17, WOOD = 17; public const LOG = 17;
public const LEAVES = 18; public const LEAVES = 18;
public const SPONGE = 19; public const SPONGE = 19;
public const GLASS = 20; public const GLASS = 20;
@ -187,7 +187,7 @@ interface BlockIds{
public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159; public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
public const STAINED_GLASS_PANE = 160; public const STAINED_GLASS_PANE = 160;
public const LEAVES2 = 161; public const LEAVES2 = 161;
public const LOG2 = 162, WOOD2 = 162; public const LOG2 = 162;
public const ACACIA_STAIRS = 163; public const ACACIA_STAIRS = 163;
public const DARK_OAK_STAIRS = 164; public const DARK_OAK_STAIRS = 164;
public const SLIME = 165, SLIME_BLOCK = 165; public const SLIME = 165, SLIME_BLOCK = 165;
@ -490,7 +490,7 @@ interface BlockIds{
public const CAMPFIRE = 464; public const CAMPFIRE = 464;
public const LAVA_CAULDRON = 465; public const LAVA_CAULDRON = 465;
public const JIGSAW = 466; public const JIGSAW = 466;
public const WOOD = 467;
public const COMPOSTER = 468; public const COMPOSTER = 468;
} }

6
src/pocketmine/item/ItemIds.php
View File

@ -26,7 +26,7 @@ namespace pocketmine\item;
interface ItemIds{ interface ItemIds{
public const COMPOSTER = -213; public const COMPOSTER = -213;
public const WOOD = -212;
public const JIGSAW = -211; public const JIGSAW = -211;
public const LAVA_CAULDRON = -210; public const LAVA_CAULDRON = -210;
public const CAMPFIRE = -209; public const CAMPFIRE = -209;
@ -255,7 +255,7 @@ interface ItemIds{
public const GOLD_ORE = 14; public const GOLD_ORE = 14;
public const IRON_ORE = 15; public const IRON_ORE = 15;
public const COAL_ORE = 16; public const COAL_ORE = 16;
public const LOG = 17, WOOD = 17; public const LOG = 17;
public const LEAVES = 18; public const LEAVES = 18;
public const SPONGE = 19; public const SPONGE = 19;
public const GLASS = 20; public const GLASS = 20;
@ -400,7 +400,7 @@ interface ItemIds{
public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159; public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
public const STAINED_GLASS_PANE = 160; public const STAINED_GLASS_PANE = 160;
public const LEAVES2 = 161; public const LEAVES2 = 161;
public const LOG2 = 162, WOOD2 = 162; public const LOG2 = 162;
public const ACACIA_STAIRS = 163; public const ACACIA_STAIRS = 163;
public const DARK_OAK_STAIRS = 164; public const DARK_OAK_STAIRS = 164;
public const SLIME = 165, SLIME_BLOCK = 165; public const SLIME = 165, SLIME_BLOCK = 165;