mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
Sneak disables Scythe AOE harvesting
This commit is contained in:
1 parent
26812bc9d3
commit
1a981fd00a
1 file changed
+9
-5
@@ -301,14 +301,18 @@ public class Scythe extends Weapon {
|
||||
if (world.isRemote) {
|
||||
return false;
|
||||
}
|
||||
if (shouldHarvestInAoe(world, x, y, z)) {
|
||||
harvestInAoe(stack, player, world, x, y, z);
|
||||
if (canPlayerHarvestCrop(world, x, y, z)) {
|
||||
if (player.isSneaking()) {
|
||||
tryHarvestCrop(stack, player, world, x, y, z);
|
||||
} else {
|
||||
harvestInAoe(stack, player, world, x, y, z);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean shouldHarvestInAoe(World world, int x, int y, int z) {
|
||||
private boolean canPlayerHarvestCrop(World world, int x, int y, int z) {
|
||||
for (CropHarvestHandler handler : CropHarvestHandlers.getCropHarvestHandlers()) {
|
||||
if (handler.couldHarvest(world, x, y, z)) {
|
||||
return true;
|
||||
@@ -322,7 +326,7 @@ public class Scythe extends Weapon {
|
||||
for (int j = -2; j < 3; j++) {
|
||||
for (int k = -2; k < 3; k++) {
|
||||
if (!(stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken"))) {
|
||||
harvestCrop(stack, player, world, x + i, y + j, z + k);
|
||||
tryHarvestCrop(stack, player, world, x + i, y + j, z + k);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -330,7 +334,7 @@ public class Scythe extends Weapon {
|
||||
}
|
||||
}
|
||||
|
||||
private static void harvestCrop(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) {
|
||||
private static void tryHarvestCrop(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) {
|
||||
for (CropHarvestHandler handler : CropHarvestHandlers.getCropHarvestHandlers()) {
|
||||
if (handler.couldHarvest(world, x, y, z)) {
|
||||
boolean harvestSuccessful = handler.tryHarvest(stack, player, world, x, y, z);
|
||||
|
||||
Reference in new issue
Block a user