Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions 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
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"/> <data android:mimeType="application/octet-stream"/>
</intent-filter> </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" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap" android:mimeType="*/*" /> <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' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = 'a077c3a' uCoreVersion = '5a10c7f'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() 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 -> { handler.register("friendlyfire", "<on/off>", "Enable or disable friendly fire.", arg -> {
String s = arg[0]; String s = arg[0];
if(s.equalsIgnoreCase("on")){ if(s.equalsIgnoreCase("on")){
NetEvents.handleFriendlyFireChange(true);
state.friendlyFire = true; state.friendlyFire = true;
info("Friendly fire enabled."); info("Friendly fire enabled.");
}else if(s.equalsIgnoreCase("off")){ }else if(s.equalsIgnoreCase("off")){
NetEvents.handleFriendlyFireChange(false);
state.friendlyFire = false; state.friendlyFire = false;
info("Friendly fire disabled."); info("Friendly fire disabled.");
}else{ }else{
@@ -447,7 +445,6 @@ public class ServerControl extends Module {
if(target != null){ if(target != null){
netServer.admins.adminPlayer(target.uuid, Net.getConnection(target.clientid).address); 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]); info("Admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
}else{ }else{
info("Nobody with that name could be found."); info("Nobody with that name could be found.");
@@ -471,7 +468,6 @@ public class ServerControl extends Module {
if(target != null){ if(target != null){
netServer.admins.unAdminPlayer(target.uuid); netServer.admins.unAdminPlayer(target.uuid);
NetEvents.handleAdminSet(target, false);
info("Un-admin-ed player by ID: {0} / {1}", target.uuid, arg[0]); info("Un-admin-ed player by ID: {0} / {1}", target.uuid, arg[0]);
}else{ }else{
info("Nobody with that name could be found."); info("Nobody with that name could be found.");