Skip to content

Commit cf063d0

Browse files
author
Meru | m9eenn
authored
Merge pull request #49 from AfnwTeam/feat/#43
fix: 農作物が完全に成長しているのに回収できない
2 parents 6f49293 + 45d90ec commit cf063d0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/java/net/azisaba/afnw/afnwcore2/listeners/block/CropsBreakCanceller.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ public void onBreakNewAgeCrops(BlockBreakEvent e) {
5959
return;
6060
}
6161

62-
if (!(b.getBlockData() instanceof Ageable)) {
63-
Ageable crop = (Ageable) b.getBlockData();
64-
if (crop.getMaximumAge() == crop.getAge()) {
65-
return;
66-
}
62+
if (b.getBlockData() instanceof Ageable crop) {
63+
if (crop.getMaximumAge() == crop.getAge()) {
64+
return;
65+
}
6766
}
6867

6968
e.setCancelled(true);

src/main/java/net/azisaba/afnw/afnwcore2/listeners/block/SaplingBreakCanceller.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ public void onBreakCrops(BlockBreakEvent e) {
6262
Player p = e.getPlayer();
6363
Block b = e.getBlock();
6464

65-
if (!Tag.CROPS.isTagged(b.getLocation().add(0, 1, 0).getBlock().getType())) {
66-
return;
67-
}
65+
if (!(Tag.SAPLINGS.isTagged(b.getLocation().add(0, 1, 0).getBlock().getType()))) {
66+
return;
67+
}
68+
6869
if (p.hasPermission("afnw.bypass.break.arable")) {
6970
p.sendMessage(Component.text("耕地保護機能を回避しました。").color(NamedTextColor.GOLD));
7071
return;

0 commit comments

Comments
 (0)