aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-02-15 21:23:08 +0000
committerGitHub <noreply@github.com>2024-02-15 21:23:08 +0000
commitfbada4d2e0f97cc77d67586fbb1db98a297afc18 (patch)
treec9cd9c6605d7a6b663525da447804dc7d14a36c8 /src/main/java
parent8e41be4adb254014b2753d370fe3ac0634e068e8 (diff)
downloadGT5-Unofficial-fbada4d2e0f97cc77d67586fbb1db98a297afc18.tar.gz
GT5-Unofficial-fbada4d2e0f97cc77d67586fbb1db98a297afc18.tar.bz2
GT5-Unofficial-fbada4d2e0f97cc77d67586fbb1db98a297afc18.zip
Allow interacting with machines instantly upon placing (#2496)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index b2458fbdcc..0a02f557d7 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -517,7 +517,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
@Override
public boolean isUseableByPlayer(EntityPlayer aPlayer) {
- return hasValidMetaTileEntity() && mTickTimer > 40
+ return hasValidMetaTileEntity() && mTickTimer > 1
&& getTileEntityOffset(0, 0, 0) == this
&& aPlayer.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) < 64
&& mMetaTileEntity.isAccessAllowed(aPlayer);
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index d8c957ceab..e387d3cd5a 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -943,7 +943,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
@Override
public boolean isUseableByPlayer(EntityPlayer aPlayer) {
return canAccessData() && playerOwnsThis(aPlayer, false)
- && mTickTimer > 40
+ && mTickTimer > 1
&& getTileEntityOffset(0, 0, 0) == this
&& aPlayer.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) < 64
&& mMetaTileEntity.isAccessAllowed(aPlayer);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index af41710054..3d24799746 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -367,7 +367,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
&& !GT_Utility.isStackInList(tCurrentItem, GregTech_API.sJackhammerList)) return false;
}
if (tTileEntity instanceof IGregTechTileEntity gtTE) {
- if (gtTE.getTimer() < 50L) {
+ if (gtTE.getTimer() < 1L) {
return false;
}
if ((!aWorld.isRemote) && !gtTE.isUseableByPlayer(aPlayer)) {