From 82058d347fe76a626e171e9bae45fdd82a2c9a71 Mon Sep 17 00:00:00 2001 From: Volas171 Date: Mon, 12 Sep 2022 07:01:15 -0500 Subject: [PATCH 1/3] Update servers_v6.json (#7547) --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index 553fde8adf..752547c0ec 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -139,4 +139,8 @@ "name": "OMNIDUSTRY", "address": ["109.94.209.233"] } + { + "name": "New Campaign Like", + "address": ["n5.yeet.ml:6568"] + }, ] From 7189be69b037a42a78ecd106dd9b70de028021d6 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 12 Sep 2022 06:41:43 -0700 Subject: [PATCH 2/3] `killShooter` + `shootOnDeath` Causes Double Firing (#7524) * Store building pos instead of start pos Fix an explosion hitting the same building multiple times if it's larger than 1x1. * Increment total shots before spawning bullet Fixes `killShooter` triggering the `shootOnDeath` shot. * Revert "Store building pos instead of start pos" This reverts commit bfd04e26837a5d91ef4b432f4f83f25d72b566de. --- core/src/mindustry/type/Weapon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 22275a6c6c..0edd2387d0 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -408,12 +408,12 @@ public class Weapon implements Cloneable{ } shoot.shoot(mount.totalShots, (xOffset, yOffset, angle, delay, mover) -> { + mount.totalShots++; if(delay > 0f){ Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover)); }else{ bullet(unit, mount, xOffset, yOffset, angle, mover); } - mount.totalShots++; }); } From cd6332900be6a937bc7334fad370554615a735f6 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 12 Sep 2022 06:59:18 -0700 Subject: [PATCH 3/3] Fix things being detached from mech sway. (#7480) --- core/src/mindustry/type/UnitType.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index eac7325f0e..58a9ae756a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -1181,10 +1181,6 @@ public class UnitType extends UnlockableContent{ drawShield(unit); } - if(mech != null){ - unit.trns(-legOffset.x, -legOffset.y); - } - //TODO how/where do I draw under? if(parts.size > 0){ for(int i = 0; i < parts.size; i++){ @@ -1212,6 +1208,10 @@ public class UnitType extends UnlockableContent{ } } + if(mech != null){ + unit.trns(-legOffset.x, -legOffset.y); + } + Draw.reset(); }