Upstream Paper
This commit is contained in:
@@ -65,7 +65,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Object entitySlice = null;
|
List<Entity> entitySlice = null;
|
||||||
// Paper end
|
// Paper end
|
||||||
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
||||||
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
||||||
|
|||||||
@@ -593,7 +593,7 @@ public abstract class World implements IBlockAccess {
|
|||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
CraftWorld world = ((WorldServer) this).getWorld();
|
CraftWorld world = ((WorldServer) this).getWorld();
|
||||||
if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
|
if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
|
||||||
BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftMagicNumbers.getId(block));
|
BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftMagicNumbers.getId(block), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); // Paper - add source block
|
||||||
this.getServer().getPluginManager().callEvent(event);
|
this.getServer().getPluginManager().callEvent(event);
|
||||||
|
|
||||||
if (event.isCancelled()) {
|
if (event.isCancelled()) {
|
||||||
|
|||||||
Submodule work/Paper updated: f7358c5cf7...a4f2aa2110
Reference in New Issue
Block a user