From e6863825d2658918d9d25a469000b3d7df62c8fd Mon Sep 17 00:00:00 2001
From: Nautilus <57863175+TomtheCoder2@users.noreply.github.com>
Date: Tue, 12 Oct 2021 20:14:20 +0200
Subject: [PATCH 1/2] Update servers_v7.json (#6142)

added our network to the server list
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 73a584e8aa..9e3ad434d4 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -54,5 +54,9 @@
   { 
     "name": "devass.su",
     "address": ["185.22.152.66"]
+  },
+  {
+    "name": "Phoenix Network",
+    "address": ["172.104.253.198"]
   }
 ]

From 21549d251831254b3eeab741cb2c59f6bdc57ff7 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Tue, 12 Oct 2021 22:14:51 +0400
Subject: [PATCH 2/2] Add new fx (#6136)

* Update Fx.java

* Update Fx.java

* Update Fx.java

* Update NetClient.java

* Update Fx.java
---
 core/src/mindustry/content/Fx.java     | 14 ++++++++++++++
 core/src/mindustry/core/NetClient.java |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 9339df49ab..44f77cb679 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -12,6 +12,7 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.Block;
 
 import static arc.graphics.g2d.Draw.rect;
 import static arc.graphics.g2d.Draw.*;
@@ -26,6 +27,19 @@ public class Fx{
     public static final Effect
 
     none = new Effect(0, 0f, e -> {}),
+    
+    blockCrash = new Effect(100f, e -> {
+        Block block = (Block)e.data;
+        if(block == null){
+            return;
+        }
+        alpha(e.fin() + 0.5f);
+        float offset = Mathf.lerp(0f, 200f, e.fout());
+        color(0f, 0f, 0f, 0.44f);
+        rect(block.fullIcon, e.x - offset * 4f, e.y, (float)block.size * 8f, (float)block.size * 8f);
+        color(Color.white);
+        rect(block.fullIcon, e.x + offset, e.y + offset * 5f, (float)block.size * 8f, (float)block.size * 8f);
+    }),
 
     trailFade = new Effect(400f, e -> {
         if(!(e.data instanceof Trail trail)) return;
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index c6cccfbcf7..ce2498792a 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -181,6 +181,13 @@ public class NetClient implements ApplicationListener{
 
         effect.at(x, y, rotation, color);
     }
+    
+    @Remote(variants = Variant.both, unreliable = true)
+    public static void effect(Effect effect, float x, float y, float rotation, Color color, Object data){
+        if(effect == null) return;
+
+        effect.at(x, y, rotation, color, data);
+    }
 
     @Remote(variants = Variant.both)
     public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){