Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-08 11:50:32 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1076: Add HurtEntities API for FallingBlock.

Browse Source
This commit is contained in:
md_5 2015-08-01 16:48:20 +10:00
parent a0d2928ba4
commit 62a216966f
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nms-patches/EntityFallingBlock.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityFallingBlock.java
+++ b/net/minecraft/server/EntityFallingBlock.java
@@ -4,6 +4,8 @@
@@ -4,13 +4,15 @@
import java.util.ArrayList;
import java.util.Iterator;
@ -9,6 +9,14 @@
public class EntityFallingBlock extends Entity {
private IBlockData block;
public int ticksLived;
public boolean dropItem = true;
private boolean e;
- private boolean hurtEntities;
+ public boolean hurtEntities; // PAIL: private -> public
private int fallHurtMax = 40;
private float fallHurtAmount = 2.0F;
public NBTTagCompound tileEntityData;
@@ -56,7 +58,7 @@
if (this.ticksLived++ == 0) {

10
src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
View File

@ -47,4 +47,14 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
public void setDropItem(boolean drop) {
getHandle().dropItem = drop;
}
@Override
public boolean canHurtEntities() {
return getHandle().hurtEntities;
}
@Override
public void setHurtEntities(boolean hurtEntities) {
getHandle().hurtEntities = hurtEntities;
}
}