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

Fire EntityFormBlockEvent for FallingBlocks. Adds BUKKIT-3078

Browse Source
This commit is contained in:
Wesley Wolfe 2012-12-04 18:30:10 -06:00
parent 4dadf0e2b5
commit b854320fc8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minecraft/server/EntityFallingBlock.java
View File

@ -3,7 +3,10 @@ package net.minecraft.server;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit //CraftBukkit start
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end
public class EntityFallingBlock extends Entity { public class EntityFallingBlock extends Entity {
@ -81,7 +84,7 @@ public class EntityFallingBlock extends Entity {
int k = MathHelper.floor(this.locZ); int k = MathHelper.floor(this.locZ);
if (this.c == 1) { if (this.c == 1) {
if (this.c == 1 && this.world.getTypeId(i, j, k) == this.id) { if (this.c == 1 && this.world.getTypeId(i, j, k) == this.id && this.world.getData(i, j, k) == this.data && !CraftEventFactory.callEntityChangeBlockEvent(this, i, j, k, 0, 0).isCancelled()) { // CraftBukkit - compare data and call event
this.world.setTypeId(i, j, k, 0); this.world.setTypeId(i, j, k, 0);
} else { } else {
this.die(); this.die();
@ -95,7 +98,13 @@ public class EntityFallingBlock extends Entity {
this.motY *= -0.5D; this.motY *= -0.5D;
if (this.world.getTypeId(i, j, k) != Block.PISTON_MOVING.id) { if (this.world.getTypeId(i, j, k) != Block.PISTON_MOVING.id) {
this.die(); this.die();
if (!this.e && this.world.mayPlace(this.id, i, j, k, true, 1, (Entity) null) && !BlockSand.canFall(this.world, i, j - 1, k) && this.world.setTypeIdAndData(i, j, k, this.id, this.data)) { // CraftBukkit start
if (!this.e && this.world.mayPlace(this.id, i, j, k, true, 1, (Entity) null) && !BlockSand.canFall(this.world, i, j - 1, k) /* mimic the false conditions of setTypeIdAndData */ && i >= -30000000 && k >= -30000000 && i < 30000000 && k < 30000000 && j > 0 && j < 256 && !(this.world.getTypeId(i, j, k) == this.id && this.world.getData(i, j, k) == this.data)) {
if (CraftEventFactory.callEntityChangeBlockEvent(this, i, j, k, this.id, this.data).isCancelled()) {
return;
}
this.world.setTypeIdAndData(i, j, k, this.id, this.data);
// CraftBukkit end
if (Block.byId[this.id] instanceof BlockSand) { if (Block.byId[this.id] instanceof BlockSand) {
((BlockSand) Block.byId[this.id]).a_(this.world, i, j, k, this.data); ((BlockSand) Block.byId[this.id]).a_(this.world, i, j, k, this.data);
} }
@ -129,7 +138,7 @@ public class EntityFallingBlock extends Entity {
// CraftBukkit start // CraftBukkit start
int damage = Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax); int damage = Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax);
EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDamageEvent(this, entity, EntityDamageEvent.DamageCause.FALLING_BLOCK, damage); EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(this, entity, EntityDamageEvent.DamageCause.FALLING_BLOCK, damage);
if (event.isCancelled()) { if (event.isCancelled()) {
continue; continue;
} }

2
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -463,7 +463,7 @@ public class CraftEventFactory {
} }
public static EntityChangeBlockEvent callEntityChangeBlockEvent(org.bukkit.entity.Entity entity, Block block, Material material, int data) { public static EntityChangeBlockEvent callEntityChangeBlockEvent(org.bukkit.entity.Entity entity, Block block, Material material, int data) {
EntityChangeBlockEvent event = new EntityChangeBlockEvent((LivingEntity) entity, block, material, (byte) data); EntityChangeBlockEvent event = new EntityChangeBlockEvent(entity, block, material, (byte) data);
entity.getServer().getPluginManager().callEvent(event); entity.getServer().getPluginManager().callEvent(event);
return event; return event;
} }