diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/BlockStationary.java b/WindSpigot-Server/src/main/java/net/minecraft/server/BlockStationary.java
index 74395747..b7068fc4 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/BlockStationary.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/BlockStationary.java
@@ -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()) {
@@ -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())
diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/World.java b/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
index 982ec221..e4bc24a6 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
@@ -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)) {