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

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2023-02-08 22:48:33 -05:00
parent a093fa5718 9c1f17fbdd
commit 3a6debfae6
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -869,7 +869,7 @@ public class NetServer implements ApplicationListener{
} }
if(state.isGame() && net.server()){ if(state.isGame() && net.server()){
if(state.rules.pvp){ if(state.rules.pvp && state.rules.pvpAutoPause){
boolean waiting = isWaitingForPlayers(), paused = state.isPaused(); boolean waiting = isWaitingForPlayers(), paused = state.isPaused();
if(waiting != paused){ if(waiting != paused){
if(waiting){ if(waiting){
@@ -1003,7 +1003,7 @@ public class NetServer implements ApplicationListener{
player.con.snapshotsSent++; player.con.snapshotsSent++;
} }
String fixName(String name){ public String fixName(String name){
name = name.trim().replace("\n", "").replace("\t", ""); name = name.trim().replace("\n", "").replace("\t", "");
if(name.equals("[") || name.equals("]")){ if(name.equals("[") || name.equals("]")){
return ""; return "";
@@ -1027,7 +1027,7 @@ public class NetServer implements ApplicationListener{
return result.toString(); return result.toString();
} }
static String checkColor(String str){ public String checkColor(String str){
for(int i = 1; i < str.length(); i++){ for(int i = 1; i < str.length(); i++){
if(str.charAt(i) == ']'){ if(str.charAt(i) == ']'){
String color = str.substring(1, i); String color = str.substring(1, i);

2
core/src/mindustry/game/Rules.java
View File

@@ -31,6 +31,8 @@ public class Rules{
public boolean waves; public boolean waves;
/** Whether the game objective is PvP. Note that this enables automatic hosting. */ /** Whether the game objective is PvP. Note that this enables automatic hosting. */
public boolean pvp; public boolean pvp;
/** Whether is waiting for players enabled in PvP. */
public boolean pvpAutoPause = true;
/** Whether to pause the wave timer until all enemies are destroyed. */ /** Whether to pause the wave timer until all enemies are destroyed. */
public boolean waitEnemies = false; public boolean waitEnemies = false;
/** Determines if gamemode is attack mode. */ /** Determines if gamemode is attack mode. */

9
core/src/mindustry/mod/ContentParser.java
View File

@@ -461,12 +461,13 @@ public class ContentParser{
} }
var typeVal = value.get("type"); var typeVal = value.get("type");
if(unit.constructor == null || typeVal != null){
if(typeVal != null && !typeVal.isString()){
throw new RuntimeException("Unit '" + name + "' has an incorrect type. Types must be strings.");
}
if(typeVal != null && !typeVal.isString()){ unit.constructor = unitType(typeVal);
throw new RuntimeException("Unit '" + name + "' has an incorrect type. Types must be strings.");
} }
unit.constructor = unitType(typeVal);
}else{ }else{
unit = locate(ContentType.unit, name); unit = locate(ContentType.unit, name);
} }

1
core/src/mindustry/world/Block.java
View File

@@ -1324,6 +1324,7 @@ public class Block extends UnlockableContent implements Senseable{
editorBase = new PixmapRegion(base); editorBase = new PixmapRegion(base);
}else{ }else{
if(gen[0] != null) packer.add(PageType.main, "block-" + name + "-full", Core.atlas.getPixmap(gen[0]));
editorBase = gen[0] == null ? Core.atlas.getPixmap(fullIcon) : Core.atlas.getPixmap(gen[0]); editorBase = gen[0] == null ? Core.atlas.getPixmap(fullIcon) : Core.atlas.getPixmap(gen[0]);
} }