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

Objectification

Browse Source
This commit is contained in:
Anuken
2020-01-14 13:32:19 -05:00
parent 68be77fa1d
commit ae2dd5732a
8 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/game/EventType.java
+2 -2
View File
@@ -186,9 +186,9 @@ public class EventType{
public static class TapConfigEvent{
public final Tile tile;
public final Player player;
public final int value;
public final Object value;
public TapConfigEvent(Tile tile, Player player, int value){
public TapConfigEvent(Tile tile, Player player, Object value){
this.tile = tile;
this.player = player;
this.value = value;
core/src/mindustry/game/Schematics.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class Schematics implements Loadable{
if(tile != null && tile.entity != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock)
&& (tile.entity.block.isVisible() || (tile.entity.block instanceof CoreBlock && Core.settings.getBool("coreselect")))){
int config = tile.entity.config();
Object config = tile.entity.config();
if(tile.block().posConfig){
config = Pos.get(Pos.x(config) + offsetX, Pos.y(config) + offsetY);
}
core/src/mindustry/game/Teams.java
+2 -2
View File
@@ -170,9 +170,9 @@ public class Teams{
* This does not include deconstructed blocks.*/
public static class BrokenBlock{
public final short x, y, rotation, block;
public final int config;
public final Object config;
public BrokenBlock(short x, short y, short rotation, short block, int config){
public BrokenBlock(short x, short y, short rotation, short block, Object config){
this.x = x;
this.y = y;
this.rotation = rotation;