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

Fixed markup crash / setsector command fixed / Drone crash fixed

Browse Source
This commit is contained in:
Anuken
2018-08-15 21:00:40 -04:00
parent c569232e74
commit 4f72011cf7
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/entities/units/types/Drone.java
View File

@@ -190,7 +190,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
public void update(){
ItemDrop item = (ItemDrop) target;
if(inventory.isFull() || !inventory.canAcceptItem(item.getItem(), 1)){
if(item == null || inventory.isFull() || !inventory.canAcceptItem(item.getItem(), 1)){
setState(drop);
return;
}
@@ -329,7 +329,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
public void update(){
super.update();
if(target != null && target.getTeam() != team){
if(state.is(repair) && target != null && target.getTeam() != team){
target = null;
}

17
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -61,10 +61,15 @@ public class ChatFragment extends Table{
visible(() -> !state.is(State.menu) && Net.active());
update(() -> {
if(!Net.active() && chatOpen){
hide();
if(!Net.active()){
clearMessages();
if(chatOpen){
hide();
}
}
if(Net.active() && Inputs.keyTap("chat")){
toggle();
}
@@ -109,9 +114,17 @@ public class ChatFragment extends Table{
super.draw(batch, parentAlpha);
getStyle().font.getData().markupEnabled = true;
}
@Override
protected void updateDisplayText(){
getStyle().font.getData().markupEnabled = false;
super.updateDisplayText();
getStyle().font.getData().markupEnabled = true;
}
};
chatfield.setTextFieldFilter((field, c) -> field.getText().length() < Vars.maxTextLength);
chatfield.getStyle().background = null;
chatfield.getStyle().messageFont = null;
chatfield.getStyle().fontColor = Color.WHITE;
chatfield.setStyle(chatfield.getStyle());
chatfield.update(() -> {