From 5eb4d25fe9e57d7b99abbc20108504ff205e0e04 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 9 Nov 2020 19:15:37 -0500 Subject: [PATCH] Fixed #3320 --- core/assets/bundles/bundle.properties | 4 ++-- core/src/mindustry/content/UnitTypes.java | 2 +- server/src/mindustry/server/ServerControl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index fe245bfbae..81f5ad0bb7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1305,8 +1305,8 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se block.router.description = Distributes input items to 3 output directions equally. block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output. block.distributor.description = Distributes input items to 7 output directions equally. -block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. -block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. +block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates. +block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates. block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers. block.mechanical-pump.description = Pumps and outputs liquids. Does not require power. block.rotary-pump.description = Pumps and outputs liquids. Requires power. diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 53757ee04b..add391402e 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -926,7 +926,7 @@ public class UnitTypes implements ContentList{ smokeEffect = Fx.shootSmallSmoke; ammoMultiplier = 2; }}; - shootSound = Sounds.shoot; + shootSound = Sounds.pew; }}); }}; diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 6732fed4c3..57200d7178 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -946,7 +946,7 @@ public class ServerControl implements ApplicationListener{ } } - if(closest != null){ + if(closest != null && !closest.text.equals("yes")){ err("Command not found. Did you mean \"" + closest.text + "\"?"); suggested = line.replace(response.runCommand, closest.text); }else{