Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-11-15 20:20:37 -05:00
parent a172c12e5d
commit bedf93f0e0
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/baseparts/753232120369119314.msch
View File

Binary file not shown.

BIN
core/assets/baseparts/772833439719489546.msch
View File

Binary file not shown.

BIN
core/assets/baseparts/772833740053020682.msch
View File

Binary file not shown.

6
core/src/mindustry/core/NetClient.java
View File

@@ -322,15 +322,15 @@ public class NetClient implements ApplicationListener{
} }
@Remote(variants = Variant.both, unreliable = true) @Remote(variants = Variant.both, unreliable = true)
public static void onEffect(Effect effect, float x, float y, float rotation, Color color){ public static void effect(Effect effect, float x, float y, float rotation, Color color){
if(effect == null) return; if(effect == null) return;
effect.at(x, y, rotation, color); effect.at(x, y, rotation, color);
} }
@Remote(variants = Variant.both) @Remote(variants = Variant.both)
public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){ public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){
onEffect(effect, x, y, rotation, color); effect(effect, x, y, rotation, color);
} }
@Remote(variants = Variant.both) @Remote(variants = Variant.both)

2
core/src/mindustry/world/blocks/ConstructBlock.java
View File

@@ -273,7 +273,7 @@ public class ConstructBlock extends Block{
int accumulated = (int)(accumulator[i]); //get amount int accumulated = (int)(accumulator[i]); //get amount
if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core
if(core != null){ if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked
int accepting = core.acceptStack(requirements[i].item, accumulated, builder); int accepting = core.acceptStack(requirements[i].item, accumulated, builder);
core.handleStack(requirements[i].item, accepting, builder); core.handleStack(requirements[i].item, accepting, builder);
accumulator[i] -= accepting; accumulator[i] -= accepting;

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=c3f584d2d17fe0a91798565b73ea4d72ad312abf archash=de1a34fbd27468986a0540d0b51146291d9f2db4