From dd9b85f79b7127c6014a4059b68686b53c5fa745 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Thu, 19 Nov 2020 18:32:03 +0100 Subject: [PATCH 1/2] Give some techtree brackets a new line --- core/src/mindustry/content/TechTree.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 325a630cf4..17fce59407 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -31,6 +31,7 @@ public class TechTree implements ContentList{ node(router, () -> { node(launchPad, Seq.with(new SectorComplete(extractionOutpost)), () -> { node(interplanetaryAccelerator, Seq.with(new SectorComplete(planetaryTerminal)), () -> { + }); }); @@ -200,6 +201,7 @@ public class TechTree implements ContentList{ }); node(illuminator, () -> { + }); }); @@ -422,6 +424,7 @@ public class TechTree implements ContentList{ node(multiplicativeReconstructor, Seq.with(new SectorComplete(overgrowth)), () -> { node(exponentialReconstructor, () -> { node(tetrativeReconstructor, () -> { + }); }); }); From 16adbd667d7f1deac9fa1fed1e3673338039a91f Mon Sep 17 00:00:00 2001 From: Skat <55407440+skykatik@users.noreply.github.com> Date: Thu, 19 Nov 2020 20:40:00 +0300 Subject: [PATCH 2/2] Update ServerControl.java --- server/src/mindustry/server/ServerControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 4e5d21183f..5d1244bedd 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -691,7 +691,7 @@ public class ServerControl implements ApplicationListener{ for(Player player : Groups.player){ if(netServer.admins.isIDBanned(player.uuid())){ - Call.sendMessage("[scarlet] " + player.name + " has been banned."); + Call.sendMessage("[scarlet]" + player.name + " has been banned."); player.con.kick(KickReason.banned); } } @@ -728,7 +728,7 @@ public class ServerControl implements ApplicationListener{ handler.register("unban", "", "Completely unban a person by IP or ID.", arg -> { if(netServer.admins.unbanPlayerIP(arg[0]) || netServer.admins.unbanPlayerID(arg[0])){ - info("Unbanned player.", arg[0]); + info("Unbanned player: @", arg[0]); }else{ err("That IP/ID is not banned!"); }