Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some admin bugs

Browse Source
This commit is contained in:
Anuken
2018-02-26 22:05:07 -05:00
parent 00c204b589
commit 17b17222b6
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -283,7 +283,7 @@ public class NetServer extends Module{
}else if(packet.action == AdminAction.trace){
TracePacket trace = new TracePacket();
trace.info = admins.getTrace(ip);
Net.sendTo(other.clientid, trace, SendMode.tcp);
Net.sendTo(id, trace, SendMode.tcp);
Log.info("&lc{0} has requested trace info of {1}.", player.name, other.name);
}
});

5
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -24,13 +24,14 @@ public class BackgroundFragment implements Fragment {
Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f,
back.getRegionWidth()*backscl, back.getRegionHeight()*backscl);
float logoscl = (int)Unit.dp.scl(7);
boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight();
float logoscl = (int)Unit.dp.scl(7) * (portrait ? 5f/7f : 1f);
TextureRegion logo = Core.skin.getRegion("logotext");
float logow = logo.getRegionWidth()*logoscl;
float logoh = logo.getRegionHeight()*logoscl;
Draw.color();
Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh);
Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15 + (portrait ? -Unit.dp.scl(30f) : 0f), logow, logoh);
}).visible(() -> state.is(State.menu)).grow();
}
}

7
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -15,6 +15,7 @@ import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.builders.button;
import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Stack;
import io.anuke.ucore.scene.ui.layout.Table;
@@ -160,8 +161,10 @@ public class PlayerListFragment implements Fragment{
NetEvents.handleAdminSet(player, true);
});
}
}).update(b -> b.setChecked(connection != null && netServer.admins.isAdmin(connection.address)))
.disabled(Net.client());
}).update(b ->{
b.setChecked(connection != null && netServer.admins.isAdmin(connection.address));
b.setDisabled(Net.client());
}).get().setTouchable(() -> Net.client() ? Touchable.disabled : Touchable.enabled);
//TODO trace info for player
t.addImageButton("icon-zoom-small", 14*2, () -> NetEvents.handleTraceRequest(player));