Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts: core/src/mindustry/content/Blocks.java core/src/mindustry/content/Planets.java core/src/mindustry/io/SaveFileReader.java core/src/mindustry/mod/ClassMap.java core/src/mindustry/type/UnitType.java core/src/mindustry/world/Block.java
This commit is contained in:
@@ -388,9 +388,15 @@ public class Block extends UnlockableContent{
|
||||
|
||||
/** Returns whether or not this block can be place on the specified */
|
||||
public boolean canPlaceOn(Tile tile, Team team, int rotation){
|
||||
return canPlaceOn(tile, team);
|
||||
}
|
||||
|
||||
/** Legacy canPlaceOn implementation, override {@link #canPlaceOn(Tile, Team, int)} instead.*/
|
||||
public boolean canPlaceOn(Tile tile, Team team){
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public boolean canBreak(Tile tile){
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user