diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index 5514b16158..98964c0353 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -259,7 +259,7 @@ public class Unloader extends Block{ public void read(Reads read, byte revision){ super.read(read, revision); int id = revision == 1 ? read.s() : read.b(); - sortItem = id == -1 ? null : content.items().get(id); + sortItem = id == -1 ? null : content.item(id); } } } diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 25f3d17e64..5a761579bf 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -784,6 +784,7 @@ public class ServerControl implements ApplicationListener{ if(info != null){ info.lastKicked = 0; + netServer.admins.kickedIPs.remove(info.lastIP); info("Pardoned player: @", info.plainLastName()); }else{ err("That ID can't be found.");