mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 20:33:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build errors

Browse Source
This commit is contained in:
Anuken 2018-06-01 13:24:11 -04:00
parent a04e432aea
commit 863c159fbb
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@ -34,7 +34,9 @@
<data android:mimeType="application/octet-stream"/>
</intent-filter>
<intent-filter>
<intent-filter android:icon="@mipmap/ic_launcher"
android:label="Mindustry Map"
android:priority="1">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap" android:mimeType="*/*" />

2
build.gradle
View File

@ -27,7 +27,7 @@ allprojects {
gdxVersion = '1.9.8'
roboVMVersion = '2.3.0'
aiVersion = '1.8.1'
uCoreVersion = 'a077c3a'
uCoreVersion = '5a10c7f'
getVersionString = {
String buildVersion = getBuildVersion()

4
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@ -251,11 +251,9 @@ public class ServerControl extends Module {
handler.register("friendlyfire", "<on/off>", "Enable or disable friendly fire.", arg -> {
String s = arg[0];
if(s.equalsIgnoreCase("on")){
NetEvents.handleFriendlyFireChange(true);
state.friendlyFire = true;
info("Friendly fire enabled.");
}else if(s.equalsIgnoreCase("off")){
NetEvents.handleFriendlyFireChange(false);
state.friendlyFire = false;
info("Friendly fire disabled.");
}else{
@ -447,7 +445,6 @@ public class ServerControl extends Module {
if(target != null){
netServer.admins.adminPlayer(target.uuid, Net.getConnection(target.clientid).address);
NetEvents.handleAdminSet(target, true);
info("Admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
}else{
info("Nobody with that name could be found.");
@ -471,7 +468,6 @@ public class ServerControl extends Module {
if(target != null){
netServer.admins.unAdminPlayer(target.uuid);
NetEvents.handleAdminSet(target, false);
info("Un-admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
}else{
info("Nobody with that name could be found.");