mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 12:13:54 -07:00
Minecraft 1.9.4
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
--- a/net/minecraft/server/EntityFallingBlock.java
|
||||
+++ b/net/minecraft/server/EntityFallingBlock.java
|
||||
@@ -4,6 +4,8 @@
|
||||
import java.util.ArrayList;
|
||||
@@ -5,6 +5,8 @@
|
||||
import java.util.Iterator;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
||||
+
|
||||
public class EntityFallingBlock extends Entity {
|
||||
|
||||
private IBlockData block;
|
||||
@@ -64,7 +66,7 @@
|
||||
@@ -65,7 +67,7 @@
|
||||
|
||||
if (this.ticksLived++ == 0) {
|
||||
blockposition = new BlockPosition(this);
|
||||
@@ -18,7 +18,7 @@
|
||||
this.world.setAir(blockposition);
|
||||
} else if (!this.world.isClientSide) {
|
||||
this.die();
|
||||
@@ -84,7 +86,7 @@
|
||||
@@ -85,7 +87,7 @@
|
||||
|
||||
if (BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
|
||||
this.onGround = false;
|
||||
@@ -27,7 +27,7 @@
|
||||
}
|
||||
|
||||
this.motX *= 0.699999988079071D;
|
||||
@@ -93,7 +95,13 @@
|
||||
@@ -94,7 +96,13 @@
|
||||
if (iblockdata.getBlock() != Blocks.PISTON_EXTENSION) {
|
||||
this.die();
|
||||
if (!this.f) {
|
||||
@@ -42,7 +42,7 @@
|
||||
if (block instanceof BlockFalling) {
|
||||
((BlockFalling) block).a_(this.world, blockposition);
|
||||
}
|
||||
@@ -152,7 +160,9 @@
|
||||
@@ -151,7 +159,9 @@
|
||||
while (iterator.hasNext()) {
|
||||
Entity entity = (Entity) iterator.next();
|
||||
|
||||
|
Reference in New Issue
Block a user