From cc8d2b6a0c071c171396b1d6e12b9c479c9f64fa Mon Sep 17 00:00:00 2001 From: NazrinNya <137837419+NazrinNya@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:24:47 +0300 Subject: [PATCH 1/6] Update servers_v7.json (#8825) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 2789d6f629..bb1fb36958 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -180,6 +180,10 @@ "address": ["event.baseduser.eu.org"], "prioritized": true }, + { + "name": "Cyandustry", + "address": ["91.218.66.162:6568"], + }, { "name": "Four Family", "address": ["118.127.8.162:25503"] From b272008a907712ac387fa3fc72cfb5235c1839be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?= <79508138+Darkness6030@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:26:17 +0300 Subject: [PATCH 2/6] Update EntityGroup.java (#8802) --- core/src/mindustry/entities/EntityGroup.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index ad97cb93b5..d4079371cc 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -84,6 +84,10 @@ public class EntityGroup implements Iterable{ } } + public Seq copy(){ + return copy(new Seq<>()); + } + public Seq copy(Seq arr){ arr.addAll(array); return arr; From 16949f1e691b33eddfa4286aac69e6da0d7f7821 Mon Sep 17 00:00:00 2001 From: Lanark53 <138503808+Lanark53@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:26:35 +0300 Subject: [PATCH 3/6] toxoflame server (#8790) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index bb1fb36958..0302686703 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -187,5 +187,9 @@ { "name": "Four Family", "address": ["118.127.8.162:25503"] + }, + { + "name": "ToxoFlame", + "address": ["193.233.133.223", "193.233.133.223:6568"] } ] From b4e03b46f6d81dfaaa954e14868d77455b603ff7 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 23 Jul 2023 13:27:11 -0700 Subject: [PATCH 4/6] Destroy bullet team (#8792) * Option for destroy bullet to be on the block's team * Random direction * h --- core/src/mindustry/entities/comp/BuildingComp.java | 2 +- core/src/mindustry/world/Block.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 7fd842cdb1..baae1f6a83 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1324,7 +1324,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //I really do not like that the bullet will not destroy derelict //but I can't do anything about it without using a random team //which may or may not cause issues with servers and js - block.destroyBullet.create(this, Team.derelict, x, y, 0); + block.destroyBullet.create(this, block.destroyBulletSameTeam ? team : Team.derelict, x, y, Mathf.randomSeed(id(), 360f)); } } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 961e8640b1..badcbc1d5f 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -170,6 +170,8 @@ public class Block extends UnlockableContent implements Senseable{ public float baseExplosiveness = 0f; /** bullet that this block spawns when destroyed */ public @Nullable BulletType destroyBullet = null; + /** if true, destroyBullet is spawned on the block's team instead of Derelict team */ + public boolean destroyBulletSameTeam = false; /** liquid used for lighting */ public @Nullable Liquid lightLiquid; /** whether cracks are drawn when this block is damaged */ From 28372b0f473e04fd17318d8cfaf5c726ae21b97c Mon Sep 17 00:00:00 2001 From: nowords123 <91344457+nowords123@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:27:46 +0100 Subject: [PATCH 5/6] added new phoenix server (#8801) Hi, I'm words an admin from phoenix I added a new phoenix server under the ip phoenix-network.dev:2023 --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 0302686703..f886451331 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -73,7 +73,7 @@ }, { "name": "Phoenix Network", - "address": ["phoenix-network.dev", "phoenix-network.dev:6464"] + "address": ["phoenix-network.dev", "phoenix-network.dev:6464", "phoenix-network.dev:2023"] }, { "name": "Xpdustry", From bfdd7ecc3af821a50a471f4abeea049e167bfb44 Mon Sep 17 00:00:00 2001 From: Mythril382 <77225817+Mythril382@users.noreply.github.com> Date: Mon, 24 Jul 2023 04:28:50 +0800 Subject: [PATCH 6/6] the camper (#8806) --- core/src/mindustry/ui/fragments/PlayerListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index 8dae9f2acf..1ce9390fcc 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -197,7 +197,7 @@ public class PlayerListFragment{ } //there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat - if(state.rules.pvp || state.rules.infiniteResources){ + if(!state.isCampaign() && (state.rules.pvp || state.rules.infiniteResources)){ t.button("@player.team", Icon.redo, bstyle, () -> { var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name); teamSelect.setFillParent(false);