diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 33247ea1e9..6bae988f24 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -352,6 +352,11 @@ public class NetServer implements ApplicationListener{ if(currentlyKicking[0] == null){ player.sendMessage("[scarlet]Nobody is being voted on."); }else{ + if(player.isLocal){ + player.sendMessage("Local players can't vote. Kick the player yourself instead."); + return; + } + //hosts can vote all they want if(player.uuid != null && (currentlyKicking[0].voted.contains(player.uuid) || currentlyKicking[0].voted.contains(admins.getInfo(player.uuid).lastIP))){ player.sendMessage("[scarlet]You've already voted. Sit down."); diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index 952510035b..45fc384d8c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -23,12 +23,12 @@ public class OreBlock extends OverlayFloor{ /** For mod use only!*/ public OreBlock(String name){ super(name); + variants = 3; } public void setup(Item ore){ this.localizedName = ore.localizedName(); this.itemDrop = ore; - this.variants = 3; this.color.set(ore.color); }