Upstream Paper

This commit is contained in:
Sotr
2018-08-28 17:11:43 +08:00
parent 751fcb584d
commit 2f87a4c54e
3 changed files with 3 additions and 3 deletions

View File

@@ -65,7 +65,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
}
}
};
Object entitySlice = null;
List<Entity> entitySlice = null;
// Paper end
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;

View File

@@ -593,7 +593,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start
CraftWorld world = ((WorldServer) this).getWorld();
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);
if (event.isCancelled()) {