Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

This commit is contained in:
Anuken
2022-03-09 11:42:18 -05:00
9 changed files with 44 additions and 19 deletions

View File

@@ -238,6 +238,24 @@ public class EventType{
}
}
public static class PayloadDropEvent{
public final Unit carrier;
public final @Nullable Unit unit;
public final @Nullable Building build;
public PayloadDropEvent(Unit carrier, Unit unit){
this.carrier = carrier;
this.unit = unit;
this.build = null;
}
public PayloadDropEvent(Unit carrier, Building build){
this.carrier = carrier;
this.build = build;
this.unit = null;
}
}
public static class UnitControlEvent{
public final Player player;
public final @Nullable Unit unit;