Chat message sound + minor JSOn fix
This commit is contained in:
@@ -198,6 +198,7 @@ public class NetClient implements ApplicationListener{
|
||||
public static void sendMessage(String message, @Nullable String unformatted, @Nullable Player playersender){
|
||||
if(Vars.ui != null){
|
||||
Vars.ui.chatfrag.addMessage(message);
|
||||
Sounds.chatMessage.play();
|
||||
}
|
||||
|
||||
//display raw unformatted text above player head
|
||||
@@ -212,6 +213,7 @@ public class NetClient implements ApplicationListener{
|
||||
public static void sendMessage(String message){
|
||||
if(Vars.ui != null){
|
||||
Vars.ui.chatfrag.addMessage(message);
|
||||
Sounds.chatMessage.play();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import mindustry.entities.*;
|
||||
public class WrapEffect extends Effect{
|
||||
public Effect effect = Fx.none;
|
||||
public Color color = Color.white.cpy();
|
||||
public float rotation = Float.NaN;
|
||||
public float rotation;
|
||||
|
||||
public WrapEffect(){
|
||||
}
|
||||
|
||||
@@ -443,6 +443,10 @@ public class ContentParser{
|
||||
|
||||
unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name);
|
||||
|
||||
if(value.has("class")){
|
||||
value.remove("class");
|
||||
}
|
||||
|
||||
var typeVal = value.get("type");
|
||||
|
||||
if(typeVal != null && !typeVal.isString()){
|
||||
|
||||
Reference in New Issue
Block a user