mirror of
https://github.com/PaperMC/Paper.git
synced 2026-10-12 10:39:53 +00:00
# Conflicts: # paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java # paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java # paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java # paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java