Skip to content

Fix BlockType occlusion check #13828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryoji-ikeda wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

Fix BlockType occlusion check #13828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.Fallable;
Expand Down Expand Up @@ -200,7 +199,7 @@ public boolean isBurnable() {

@Override
public boolean isOccluding() {
return this.getHandle().defaultBlockState().isRedstoneConductor(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
return this.getHandle().defaultBlockState().canOcclude();
}

@Override
Expand Down
9 changes: 9 additions & 0 deletions paper-server/src/test/java/org/bukkit/craftbukkit/block/BlockTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ public void testBlockDataClasses() throws Exception {
assertThat(actual, is(expected));
}
}

@Test
public void testOcclusionMatchesDefaultBlockData() throws Exception {
for (Field f : BlockType.class.getDeclaredFields()) {
BlockType type = (BlockType) f.get(null);

assertThat(type.isOccluding(), is(type.createBlockData().isOccluding()), type.getKey() + " should match its default BlockData occlusion");
}
}
}
Loading