This commit is contained in:
Anuken
2022-02-14 12:04:58 -05:00
parent bea112a63c
commit c56454ae9d
3 changed files with 15 additions and 11 deletions

View File

@@ -352,6 +352,13 @@ public class NetClient implements ApplicationListener{
player.set(x, y);
}
@Remote(variants = Variant.both, unreliable = true)
public static void setCameraPosition(float x, float y){
if(Core.camera != null){
Core.camera.position.set(x, y);
}
}
@Remote
public static void playerDisconnect(int playerid){
if(netClient != null){

View File

@@ -129,11 +129,12 @@ public class Teams{
unit.team.data().updateCount(unit.type, 1);
if(unit instanceof Payloadc payloadc){
payloadc.payloads().each(p -> {
if(p instanceof UnitPayload payload){
var payloads = payloadc.payloads();
for(int i = 0; i < payloads.size; i++){
if(payloads.get(i) instanceof UnitPayload payload){
count(payload.unit);
}
});
}
}
}

View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.power;
import arc.*;
import arc.func.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
@@ -99,6 +100,8 @@ public class ItemLiquidGenerator extends PowerGenerator{
}
public class ItemLiquidGeneratorBuild extends GeneratorBuild{
protected Boolf<Liquid> liquidFilter = other -> liquids.get(other) >= 0.001f && getLiquidEfficiency(other) >= minLiquidEfficiency;
public float explosiveness, heat, totalTime;
@Override
@@ -120,14 +123,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
return;
}
Liquid liquid = null;
for(Liquid other : content.liquids()){
if(hasLiquids && liquids.get(other) >= 0.001f && getLiquidEfficiency(other) >= minLiquidEfficiency){
liquid = other;
break;
}
}
Liquid liquid = hasLiquids ? content.liquids().find(liquidFilter) : null;
totalTime += heat * Time.delta;
//liquid takes priority over solids