From 93c6fa64f71ac4eefdded0e8044db6ef3af9e371 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Fri, 5 Nov 2021 23:42:10 +1000 Subject: [PATCH 1/4] Unsuccesful updating (#6302) I have unsuccesful update to 134.1, because i need a create ALL maps from 0. --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index 98cbeb7ac5..39130c65cd 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -7,6 +7,10 @@ "name": "RCM", "address": ["185.104.248.61", "easyplay.su"] }, + { + "name": "SkaarjDustry", + "address": ["skaarjproject.duckdns.org"] + }, { "name": "{AA}", "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] From b88ddef3c54f2e5694fd205285ed6682b8098341 Mon Sep 17 00:00:00 2001 From: OSP <76648940+osp54@users.noreply.github.com> Date: Sat, 6 Nov 2021 17:56:30 +0200 Subject: [PATCH 2/4] XCore hosting is now exists. (#6308) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index fcefdd7745..c0827a6205 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "XCore", - "address": ["35.202.253.94", "35.202.253.94:2000"] + "address": ["skaarjproject.duckdns.org:2000"] }, { "name": "Obvilion Network", From fff7283568d868614f91d721aa4faf4744371974 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 6 Nov 2021 18:12:38 -0700 Subject: [PATCH 3/4] Pointless if (#6310) --- core/src/mindustry/entities/bullet/EmpBulletType.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/mindustry/entities/bullet/EmpBulletType.java b/core/src/mindustry/entities/bullet/EmpBulletType.java index 7e281e3b08..539d27d46a 100644 --- a/core/src/mindustry/entities/bullet/EmpBulletType.java +++ b/core/src/mindustry/entities/bullet/EmpBulletType.java @@ -21,9 +21,7 @@ public class EmpBulletType extends BasicBulletType{ Vars.indexer.allBuildings(x, y, radius, other -> { if(other.team == b.team){ if(other.block.hasPower && other.block.canOverdrive && other.timeScale < timeIncrease){ - if(timeIncrease >= other.timeScale){ - other.timeScale = Math.max(other.timeScale, timeIncrease); - } + other.timeScale = Math.max(other.timeScale, timeIncrease); other.timeScaleDuration = Math.max(other.timeScaleDuration, timeDuration); chainEffect.at(x, y, 0, hitColor, other); applyEffect.at(other, other.block.size * 7f); From 1dd0f67dafed089360648ba4176e9e3bd31baa4d Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 7 Nov 2021 19:33:11 -0800 Subject: [PATCH 4/4] `recoil = recoilAmount` twice (#6312) --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 45c049c6a0..2970fa1d45 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -419,9 +419,6 @@ public class Turret extends ReloadTurret{ int ii = i; Time.run(burstSpacing * i, () -> { if(dead || !hasAmmo()) return; - - recoil = recoilAmount; - tr.trns(rotation, shootLength, Mathf.range(xRand)); bullet(type, rotation + Mathf.range(inaccuracy + type.inaccuracy) + (ii - (int)(shots / 2f)) * spread); effects(); @@ -508,4 +505,4 @@ public class Turret extends ReloadTurret{ return 1; } } -} \ No newline at end of file +}