Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7823: Suspicious sand and gravel material are not marked as having gravity correctly

Browse Source
This commit is contained in:
md_5 2024-07-10 18:50:13 +10:00
parent aceddcd0bf
commit 2444c8b235
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
View File

@ -12,9 +12,9 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.level.BlockAccessAir; import net.minecraft.world.level.BlockAccessAir;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.BlockFalling;
import net.minecraft.world.level.block.BlockFire; import net.minecraft.world.level.block.BlockFire;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.Fallable;
import net.minecraft.world.level.block.state.BlockBase; import net.minecraft.world.level.block.state.BlockBase;
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.phys.MovingObjectPositionBlock; import net.minecraft.world.phys.MovingObjectPositionBlock;
@ -196,7 +196,7 @@ public class CraftBlockType<B extends BlockData> implements BlockType.Typed<B>,
@Override @Override
public boolean hasGravity() { public boolean hasGravity() {
return block instanceof BlockFalling; return block instanceof Fallable;
} }
@Override @Override

4
src/test/java/org/bukkit/PerMaterialTest.java
View File

@ -13,9 +13,9 @@ import net.minecraft.world.item.Equipable;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.level.BlockAccessAir; import net.minecraft.world.level.BlockAccessAir;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.BlockFalling;
import net.minecraft.world.level.block.BlockFire; import net.minecraft.world.level.block.BlockFire;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.Fallable;
import net.minecraft.world.level.block.entity.TileEntityFurnace; import net.minecraft.world.level.block.entity.TileEntityFurnace;
import net.minecraft.world.level.block.state.BlockBase; import net.minecraft.world.level.block.state.BlockBase;
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
@ -171,7 +171,7 @@ public class PerMaterialTest extends AbstractTestingBase {
@EnumSource(value = Material.class, names = "LEGACY_.*", mode = EnumSource.Mode.MATCH_NONE) @EnumSource(value = Material.class, names = "LEGACY_.*", mode = EnumSource.Mode.MATCH_NONE)
public void hasGravity(Material material) { public void hasGravity(Material material) {
if (material.isBlock()) { if (material.isBlock()) {
assertThat(material.hasGravity(), is(CraftMagicNumbers.getBlock(material) instanceof BlockFalling)); assertThat(material.hasGravity(), is(CraftMagicNumbers.getBlock(material) instanceof Fallable));
} else { } else {
assertFalse(material.hasGravity()); assertFalse(material.hasGravity());
} }