mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-13 04:42:07 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2019-10-11 09:15:30 -04:00
commit a05ee8bbb8
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/io/anuke/mindustry/game/EventType.java
View file

@ -132,7 +132,13 @@ public class EventType{
/** Called when a player deposits items to a block.*/
public static class DepositEvent{
public final Tile tile;
public final Player player;
public DepositEvent(Tile tile, Player player){
this.tile = tile;
this.player = player;
}
}
public static class GameOverEvent{

2
core/src/io/anuke/mindustry/input/InputHandler.java
View file

@ -105,7 +105,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
int[] remaining = {accepted, accepted};
Block block = tile.block();
Events.fire(new DepositEvent());
Core.app.post(() -> Events.fire(new DepositEvent(tile, player)));
for(int i = 0; i < sent; i++){
boolean end = i == sent - 1;