Skip to content

Fix checks #184

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
kalibrieren wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix checks #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbacddb
Update BlockStationary.java
kalibrieren Oct 6, 2026
f8db010
Update World.java
kalibrieren Oct 6, 2026
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
4 changes: 2 additions & 2 deletions WindSpigot-Server/src/main/java/net/minecraft/server/BlockStationary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void b(World world, BlockPosition blockposition, IBlockData iblockdata, R
if (block.material == Material.AIR) {
if (this.f(world, blockposition1)) {
// CraftBukkit start - Prevent lava putting something on fire
if (world.getType(blockposition1) != Blocks.FIRE) {
if (world.getType(blockposition1).getBlock() != Blocks.FIRE) {
if (CraftEventFactory.callBlockIgniteEvent(world, blockposition1.getX(),
blockposition1.getY(), blockposition1.getZ(), blockposition.getX(),
blockposition.getY(), blockposition.getZ()).isCancelled()) {
Expand All @@ -69,7 +69,7 @@ public void b(World world, BlockPosition blockposition, IBlockData iblockdata, R
if (world.isEmpty(blockposition2.up()) && this.m(world, blockposition2)) {
// CraftBukkit start - Prevent lava putting something on fire
BlockPosition up = blockposition2.up();
if (world.getType(up) != Blocks.FIRE) {
if (world.getType(up).getBlock() != Blocks.FIRE) {
if (CraftEventFactory
.callBlockIgniteEvent(world, up.getX(), up.getY(), up.getZ(),
blockposition.getX(), blockposition.getY(), blockposition.getZ())
Expand Down
2 changes: 1 addition & 1 deletion WindSpigot-Server/src/main/java/net/minecraft/server/World.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@ public List<AxisAlignedBB> getCubes(Entity entity, AxisAlignedBB axisalignedbb)
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));

for (int j2 = 0; j2 < list.size(); ++j2) {
if (entity.passenger != list && entity.vehicle != list) {
if (entity.passenger != list.get(j2) && entity.vehicle != list.get(j2)) {
AxisAlignedBB axisalignedbb1 = ((Entity) list.get(j2)).S();

if (axisalignedbb1 != null && axisalignedbb1.b(axisalignedbb)) {
Expand Down
Loading