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

oh no

Browse Source
This commit is contained in:
Anuken
2020-03-05 18:05:59 -05:00
parent 2dfbbdfd5b
commit 5a0d079a78
62 changed files with 1296 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/game/EventType.java
View File

@@ -146,12 +146,12 @@ public class EventType{
/** Called when the player withdraws items from a block. */
public static class WithdrawEvent{
public final Tile tile;
public final Tilec tile;
public final Playerc player;
public final Item item;
public final int amount;
public WithdrawEvent(Tile tile, Playerc player, Item item, int amount){
public WithdrawEvent(Tilec tile, Playerc player, Item item, int amount){
this.tile = tile;
this.player = player;
this.item = item;
@@ -161,12 +161,12 @@ public class EventType{
/** Called when a player deposits items to a block.*/
public static class DepositEvent{
public final Tile tile;
public final Tilec tile;
public final Playerc player;
public final Item item;
public final int amount;
public DepositEvent(Tile tile, Playerc player, Item item, int amount){
public DepositEvent(Tilec tile, Playerc player, Item item, int amount){
this.tile = tile;
this.player = player;
this.item = item;
@@ -176,10 +176,10 @@ public class EventType{
/** Called when the player taps a block. */
public static class TapEvent{
public final Tile tile;
public final Tilec tile;
public final Playerc player;
public TapEvent(Tile tile, Playerc player){
public TapEvent(Tilec tile, Playerc player){
this.tile = tile;
this.player = player;
}
@@ -187,11 +187,11 @@ public class EventType{
/** Called when the player sets a specific block. */
public static class TapConfigEvent{
public final Tile tile;
public final Tilec tile;
public final Playerc player;
public final Object value;
public TapConfigEvent(Tile tile, Playerc player, Object value){
public TapConfigEvent(Tilec tile, Playerc player, Object value){
this.tile = tile;
this.player = player;
this.value = value;

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

@@ -263,7 +263,7 @@ public class Schematics implements Loadable{
Tile tile = world.tile(st.x + ox, st.y + oy);
if(tile == null) return;
tile.set(st.block, state.rules.defaultTeam);
tile.setBlock(st.block, state.rules.defaultTeam, 0);
tile.rotation(st.rotation);
Object config = st.config;