mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-19 03:51:07 -07:00
Code Issues Projects Releases Wiki Activity

Crash fix

Browse source
This commit is contained in:
Anuken 2019-10-09 22:02:54 -04:00
parent 42d96fa356
commit 720f7c0b0f
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/io/anuke/mindustry/core/NetServer.java
View file

@ -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.");

2
core/src/io/anuke/mindustry/world/blocks/OreBlock.java
View file

@ -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);
}