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

Fixed #8161 / Fixed #8162

Browse Source
This commit is contained in:
Anuken
2023-01-12 14:30:57 -05:00
parent 53e8eaae75
commit f49e05a915
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/Puddles.java
View File

@@ -69,7 +69,7 @@ public class Puddles{
if(tile.floor().solid) return; if(tile.floor().solid) return;
Puddle p = map.get(tile.pos()); Puddle p = map.get(tile.pos());
if(p == null){ if(p == null || p.liquid == null){
Puddle puddle = Puddle.create(); Puddle puddle = Puddle.create();
puddle.tile = tile; puddle.tile = tile;
puddle.liquid = liquid; puddle.liquid = liquid;
@@ -107,6 +107,8 @@ public class Puddles{
/** Reacts two liquids together at a location. */ /** Reacts two liquids together at a location. */
private static float reactPuddle(Liquid dest, Liquid liquid, float amount, Tile tile, float x, float y){ private static float reactPuddle(Liquid dest, Liquid liquid, float amount, Tile tile, float x, float y){
if(dest == null) return 0f;
if((dest.flammability > 0.3f && liquid.temperature > 0.7f) || if((dest.flammability > 0.3f && liquid.temperature > 0.7f) ||
(liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid (liquid.flammability > 0.3f && dest.temperature > 0.7f)){ //flammable liquid + hot liquid
Fires.create(tile); Fires.create(tile);

4
core/src/mindustry/entities/comp/PuddleComp.java
View File

@@ -142,6 +142,8 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
@Override @Override
public void afterSync(){ public void afterSync(){
Puddles.register(self()); if(liquid != null){
Puddles.register(self());
}
} }
} }

4
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -261,7 +261,9 @@ public class ArcNetProvider implements NetProvider{
} }
ByteBuffer buffer = ByteBuffer.wrap(packet.getData()); ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer); Host host = NetworkIO.readServerData((int)Time.timeSinceMillis(time), packet.getAddress().getHostAddress(), buffer);
callback.get(host); Core.app.post(() -> {
callback.get(host);
});
foundAddresses.add(packet.getAddress()); foundAddresses.add(packet.getAddress());
}catch(Exception e){ }catch(Exception e){
//don't crash when there's an error pinging a server or parsing data //don't crash when there's an error pinging a server or parsing data