Fix rebase

This commit is contained in:
TheMode 2021-06-10 16:12:42 +02:00
parent 14879636f1
commit f31639c45c

View File

@ -2320,21 +2320,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
return callItemUpdateStateEvent(true, hand);
}
/**
* Makes the player digging a custom block, see {@link #resetTargetBlock()} to rewind.
*
* @param targetCustomBlock the custom block to dig
* @param targetBlockPosition the custom block position
* @param breakers the breakers of the block, can be null if {@code this} is the only breaker
*/
public void setTargetBlock(@NotNull CustomBlock targetCustomBlock, @NotNull BlockPosition targetBlockPosition,
@Nullable Set<Player> breakers) {
this.targetCustomBlock = targetCustomBlock;
this.targetBlockPosition = targetBlockPosition;
refreshBreakDelay(breakers);
}
/**
* Refreshes the break delay for the next block break stage.
*