mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 20:57:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2265

Browse Source
This commit is contained in:
Anuken
2020-07-25 10:59:18 -04:00
parent b180462c45
commit ef381cb970
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
View File

@ -28,6 +28,7 @@ public class ContinuousLaserBulletType extends BulletType{
pierce = true; pierce = true;
hittable = false; hittable = false;
hitColor = colors[2]; hitColor = colors[2];
collidesTiles = false;
incendAmount = 1; incendAmount = 1;
incendSpread = 5; incendSpread = 5;
incendChance = 0.4f; incendChance = 0.4f;

2
core/src/mindustry/ui/dialogs/ResearchDialog.java
View File

@ -189,7 +189,7 @@ public class ResearchDialog extends BaseDialog{
} }
boolean locked(TechNode node){ boolean locked(TechNode node){
return node.content.locked(); return node.content.locked() || Structs.contains(node.requirements, i -> i.item.locked());
} }
class LayoutNode extends TreeNode<LayoutNode>{ class LayoutNode extends TreeNode<LayoutNode>{

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=7cc77789e24f6c78fc61922ab2025d1f2d0df7bf archash=5743c603a03f521a841da6104192bcb679d58889