Fixed #4869

Anuken · Mar 6, 2021 · 07d11f0 · 07d11f0 · USMP-lancer · Mar 6, 2021
1 parent fce30e6
commit 07d11f0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
@@ -190,7 +190,7 @@ public static void sendMessage(String message){
     public static void sendChatMessage(Player player, String message){
 
         //do not receive chat messages from clients that are too young or not registered
-        if(Time.timeSinceMillis(player.con.connectTime) < 500 || !player.con.hasConnected || !player.isAdded()) return;
+        if(net.server() && player != null && (Time.timeSinceMillis(player.con.connectTime) < 500 || !player.con.hasConnected || !player.isAdded())) return;
 
         if(message.length() > maxTextLength){
             throw new ValidateException(player, "Player has sent a message above the text limit.");

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
@@ -92,6 +92,16 @@ public class ContentParser{
             readFields(result, data);
             return result;
         });
+        put(Weather.class, (type, data) -> {
+            if(data.isString()){
+                return field(Weathers.class, data);
+            }
+            var bc = resolve(data.getString("type", ""), ParticleWeather.class);
+            data.remove("type");
+            Weather result = make(bc);
+            readFields(result, data);
+            return result;
+        });
         put(DrawBlock.class, (type, data) -> {
             if(data.isString()){
                 //try to instantiate

diff --git a/fastlane/metadata/android/en-US/changelogs/29831.txt b/fastlane/metadata/android/en-US/changelogs/29831.txt
@@ -0,0 +1,9 @@
+[This is a truncated changelog, see Github for full notes]
+- Various minor bugfixes
+- Made water extractor use metaglass for building, to be consistent with pumps
+- Added automatic conveyor/conduit bridging over obstacles
+- Added 'defender' AI for Oct; follows nearby units
+- Cores can now replace most transport blocks; turrets can now replace each other
+- Improved bridge & power node linking previews
+- Buffed Segment & Vela
+- Logic: More hints