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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-06-10 10:11:28 -04:00
parent 340bc5f2f7
commit 6d1b8b81fa
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -17,8 +17,8 @@ public class UnitTypes implements ContentList{
spirit = new UnitType("spirit", Spirit.class, Spirit::new){{ spirit = new UnitType("spirit", Spirit.class, Spirit::new){{
isFlying = true; isFlying = true;
drag = 0.01f; drag = 0.01f;
speed = 0.2f; speed = 0.4f;
maxVelocity = 0.8f; maxVelocity = 1.6f;
range = 50f; range = 50f;
health = 60; health = 60;
engineSize = 1.8f; engineSize = 1.8f;
@@ -217,8 +217,8 @@ public class UnitTypes implements ContentList{
isFlying = true; isFlying = true;
drag = 0.01f; drag = 0.01f;
mass = 2f; mass = 2f;
speed = 0.2f; speed = 0.45f;
maxVelocity = 0.9f; maxVelocity = 1.9f;
range = 70f; range = 70f;
itemCapacity = 70; itemCapacity = 70;
health = 220; health = 220;

2
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -229,7 +229,7 @@ public class NetClient implements ApplicationListener{
int id = input.readInt(); int id = input.readInt();
byte typeID = input.readByte(); byte typeID = input.readByte();
SyncTrait entity = (SyncTrait)group.getByID(id); SyncTrait entity = group == null ? null : (SyncTrait)group.getByID(id);
boolean add = false; boolean add = false;
if(entity == null && id == player.id){ if(entity == null && id == player.id){

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

@@ -429,7 +429,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
public void drawBuildRequests(){ public void drawBuildRequests(){
BuildRequest last = null; BuildRequest last = null;
for(BuildRequest request : getPlaceQueue()){ for(BuildRequest request : getPlaceQueue()){
if(getCurrentRequest() == request && request.progress > 0.001f) continue; if(getCurrentRequest() == request && request.progress > 0.001f && (dst(request.x * tilesize, request.y * tilesize) <= placeDistance || state.isEditor())) continue;
if(request.breaking){ if(request.breaking){
Block block = world.ltile(request.x, request.y).block(); Block block = world.ltile(request.x, request.y).block();

2
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -171,7 +171,7 @@ public class JoinDialog extends FloatingDialog{
t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("players", host.players) : t.add("[lightgray]" + (host.players != 1 ? Core.bundle.format("players", host.players) :
Core.bundle.format("players.single", host.players))).left(); Core.bundle.format("players.single", host.players))).left();
t.row(); t.row();
t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + " / " + Core.bundle.format("save.wave", host.wave)).width(targetWidth() - 10f).left().get().setEllipsis(true); t.add("[lightgray]" + Core.bundle.format("save.map", host.mapname) + "[] / " + Core.bundle.format("save.wave", host.wave)).width(targetWidth() - 10f).left().get().setEllipsis(true);
}).expand().left().bottom().padLeft(12f).padBottom(8); }).expand().left().bottom().padLeft(12f).padBottom(8);
}, e -> { }, e -> {