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

Merge pull request #3603 from skykatik/patch-12

Browse Source 
Some typos
This commit is contained in:
Anuken
2020-11-25 18:28:30 -05:00
committed by GitHub
parent 9a7d359626 488147759a
commit 6be2b6021b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/core/NetClient.java
View File

@@ -41,7 +41,7 @@ public class NetClient implements ApplicationListener{
private boolean connecting = false; private boolean connecting = false;
/** If true, no message will be shown on disconnect. */ /** If true, no message will be shown on disconnect. */
private boolean quiet = false; private boolean quiet = false;
/** Whether to supress disconnect events completely.*/ /** Whether to suppress disconnect events completely.*/
private boolean quietReset = false; private boolean quietReset = false;
/** Counter for data timeout. */ /** Counter for data timeout. */
private float timeoutTime = 0f; private float timeoutTime = 0f;
@@ -345,7 +345,7 @@ public class NetClient implements ApplicationListener{
ui.showInfoToast(message, duration); ui.showInfoToast(message, duration);
} }
@Remote(variants = Variant.both) @Remote(variants = Variant.both)
public static void warningToast(int unicode, String text){ public static void warningToast(int unicode, String text){
if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return; if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return;

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

@@ -422,7 +422,7 @@ public class NetServer implements ApplicationListener{
currentlyKicking[0] = session; currentlyKicking[0] = session;
} }
}else{ }else{
player.sendMessage("[scarlet]No player[orange]'" + args[0] + "'[scarlet] found."); player.sendMessage("[scarlet]No player [orange]'" + args[0] + "'[scarlet] found.");
} }
} }
}); });

2
core/src/mindustry/ctype/Content.java
View File

@@ -31,7 +31,7 @@ public abstract class Content implements Comparable<Content>, Disposable{
*/ */
public void load(){} public void load(){}
/** @return whether an error ocurred during mod loading. */ /** @return whether an error occurred during mod loading. */
public boolean hasErrored(){ public boolean hasErrored(){
return minfo.error != null; return minfo.error != null;
} }

4
core/src/mindustry/mod/Mods.java
View File

@@ -677,7 +677,7 @@ public class Mods implements Loadable{
public Seq<String> missingDependencies = new Seq<>(); public Seq<String> missingDependencies = new Seq<>();
/** Script files to run. */ /** Script files to run. */
public Seq<Fi> scripts = new Seq<>(); public Seq<Fi> scripts = new Seq<>();
/** Content with intialization code. */ /** Content with initialization code. */
public ObjectSet<Content> erroredContent = new ObjectSet<>(); public ObjectSet<Content> erroredContent = new ObjectSet<>();
/** Current state of this mod. */ /** Current state of this mod. */
public ModState state = ModState.enabled; public ModState state = ModState.enabled;
@@ -708,7 +708,7 @@ public class Mods implements Loadable{
return !erroredContent.isEmpty(); return !erroredContent.isEmpty();
} }
/** @return whether this mod is supported by the game verison */ /** @return whether this mod is supported by the game version */
public boolean isSupported(){ public boolean isSupported(){
if(isOutdated()) return false; if(isOutdated()) return false;