Selective upstream merge

This commit is contained in:
matt
2019-04-02 16:26:51 -04:00
parent 7ad364917f
commit 47e66913e3
7 changed files with 47 additions and 21 deletions

View File

@ -290,7 +290,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
}
@Override
public <B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, B block) {
public void sendFakeBlock(BlockVector3 pos, BlockStateHolder block) {
Location loc = new Location(player.getWorld(), pos.getX(), pos.getY(), pos.getZ());
if (block == null) {
player.sendBlockChange(loc, player.getWorld().getBlockAt(loc).getBlockData());