mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-05-04 10:44:21 -04:00
parent a1624f61ae
commit a4fd88a440
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@ -416,8 +416,6 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
Draw.color(0f, 0f, 0f, 0.3f * (textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime)); Draw.color(0f, 0f, 0f, 0.3f * (textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime));
Fill.rect(x, y + textHeight + layout.height - layout.height/2f, layout.width + 2, layout.height + 3); Fill.rect(x, y + textHeight + layout.height - layout.height/2f, layout.width + 2, layout.height + 3);
font.draw(text, x - width/2f, y + textHeight + layout.height, width, Align.center, true); font.draw(text, x - width/2f, y + textHeight + layout.height, width, Align.center, true);
textFadeTime -= Time.delta() / (60 * 5);
} }
Draw.reset(); Draw.reset();

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@ -8,6 +8,7 @@ import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Geometry;
import io.anuke.arc.math.geom.Point2; import io.anuke.arc.math.geom.Point2;
import io.anuke.arc.scene.ui.TextField;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
@ -17,6 +18,7 @@ import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import static io.anuke.arc.Core.scene;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.input.PlaceMode.*; import static io.anuke.mindustry.input.PlaceMode.*;
@ -130,7 +132,7 @@ public class DesktopInput extends InputHandler{
player.isShooting = false; player.isShooting = false;
} }
if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen()){ if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen() && !(scene.getKeyboardFocus() instanceof TextField)){
if(!ui.minimap.isShown()){ if(!ui.minimap.isShown()){
ui.minimap.show(); ui.minimap.show();
}else{ }else{

5
core/src/io/anuke/mindustry/io/TypeIO.java
View File

@ -214,12 +214,13 @@ public class TypeIO{
@WriteClass(Liquid.class) @WriteClass(Liquid.class)
public static void writeLiquid(ByteBuffer buffer, Liquid liquid){ public static void writeLiquid(ByteBuffer buffer, Liquid liquid){
buffer.put(liquid.id); buffer.put(liquid == null ? -1 : liquid.id);
} }
@ReadClass(Liquid.class) @ReadClass(Liquid.class)
public static Liquid readLiquid(ByteBuffer buffer){ public static Liquid readLiquid(ByteBuffer buffer){
return content.liquid(buffer.get()); byte id = buffer.get();
return id == -1 ? null : content.liquid(buffer.get());
} }
@WriteClass(BulletType.class) @WriteClass(BulletType.class)