wind-explorer/effortless-building
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue #45: Can't break blocks in survival mode if breakFar=false.

Browse Source
This commit is contained in:
Christian Knaapen
2019-07-09 02:23:35 +02:00
parent 3921a0b70b
commit 2c6b58ddc6
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
View File

@@ -39,7 +39,7 @@ public class EffortlessBuilding
{
public static final String MODID = "effortlessbuilding";
public static final String NAME = "Effortless Building";
public static final String VERSION = "1.12.2-2.12";
public static final String VERSION = "1.12.2-2.13";
@Mod.Instance(EffortlessBuilding.MODID)
public static EffortlessBuilding instance;

9
src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
View File

@@ -122,11 +122,6 @@ public class BuildModes {
//Use a network message to break blocks in the distance using clientside mouse input
public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
//Early out if cant break far, coming from own mouse event (not block broken event)
//To make breaking blocks in survival possible without breaking instantly
if (!ReachHelper.canBreakFar(player)) return;
onBlockBroken(player, startPos, true);
}
@@ -149,10 +144,6 @@ public class BuildModes {
ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
//Early out if cant break far and (if in normal mode) no modifier is enabled
//So either cant break far and you are not in normal mode or cant break far and you are in normal mode, but no modifier is enabled
// if (!ReachHelper.canBreakFar(player) && (breakStartPos || !BuildModifiers.isEnabled(modifierSettings, startPos))) return;
//Get coordinates
BuildModeEnum buildMode = modeSettings.getBuildMode();
List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);

5
src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
View File

@@ -261,6 +261,11 @@ public class ClientProxy implements IProxy {
//Break block in distance in creative (or survival if enabled in config)
if (breakCooldown <= 0) {
breakCooldown = 4;
//Early out if cant break far, coming from own mouse event (not block broken event)
//To make breaking blocks in survival possible without breaking instantly
if (!ReachHelper.canBreakFar(player)) return;
RayTraceResult lookingAt = getLookingAt(player);
BuildModes.onBlockBrokenMessage(player, lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));