mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-27 16:09:57 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f2f5fde3a5
@ -135,10 +135,14 @@ public class EventType{
|
|||||||
public static class DepositEvent{
|
public static class DepositEvent{
|
||||||
public final Tile tile;
|
public final Tile tile;
|
||||||
public final Player player;
|
public final Player player;
|
||||||
|
public final Item item;
|
||||||
|
public final int amount;
|
||||||
|
|
||||||
public DepositEvent(Tile tile, Player player){
|
public DepositEvent(Tile tile, Player player, Item item, int amount){
|
||||||
this.tile = tile;
|
this.tile = tile;
|
||||||
this.player = player;
|
this.player = player;
|
||||||
|
this.item = item;
|
||||||
|
this.amount = amount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
|||||||
int[] remaining = {accepted, accepted};
|
int[] remaining = {accepted, accepted};
|
||||||
Block block = tile.block();
|
Block block = tile.block();
|
||||||
|
|
||||||
Core.app.post(() -> Events.fire(new DepositEvent(tile, player)));
|
Core.app.post(() -> Events.fire(new DepositEvent(tile, player, item, accepted)));
|
||||||
|
|
||||||
for(int i = 0; i < sent; i++){
|
for(int i = 0; i < sent; i++){
|
||||||
boolean end = i == sent - 1;
|
boolean end = i == sent - 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user