|
88 | 88 | import org.bukkit.FluidCollisionMode; |
89 | 89 | import org.bukkit.Material; |
90 | 90 | import org.bukkit.block.Block; |
91 | | -import org.bukkit.block.BlockFace; |
92 | 91 | import org.bukkit.block.BlockState; |
93 | 92 | import org.bukkit.block.Sign; |
94 | | -import org.bukkit.block.data.Waterlogged; |
95 | 93 | import org.bukkit.command.PluginCommand; |
96 | 94 | import org.bukkit.entity.ArmorStand; |
97 | 95 | import org.bukkit.entity.Boat; |
@@ -1370,22 +1368,7 @@ public void onBoatPlace(EntityPlaceEvent event) { |
1370 | 1368 |
|
1371 | 1369 | @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) |
1372 | 1370 | public void onBucketEmpty(PlayerBucketEmptyEvent event) { |
1373 | | - BlockFace bf = event.getBlockFace(); |
1374 | | - // Note: a month after Bukkit 1.14.4 released, they added the API method |
1375 | | - // PlayerBucketEmptyEvent#getBlock(), which returns the block the |
1376 | | - // bucket contents is going to be placed at. Currently we determine this |
1377 | | - // block ourselves to retain compatibility with 1.13. |
1378 | | - final Block block; |
1379 | | - // if the block can be waterlogged, the event might waterlog the block |
1380 | | - // sometimes |
1381 | | - if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged |
1382 | | - && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) { |
1383 | | - block = event.getBlockClicked(); |
1384 | | - } else { |
1385 | | - block = event.getBlockClicked().getLocation() |
1386 | | - .add(bf.getModX(), bf.getModY(), bf.getModZ()) |
1387 | | - .getBlock(); |
1388 | | - } |
| 1371 | + final Block block = event.getBlock(); |
1389 | 1372 | Location location = BukkitUtil.adapt(block.getLocation()); |
1390 | 1373 | PlotArea area = location.getPlotArea(); |
1391 | 1374 | if (area == null) { |
|
0 commit comments