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

API: add DropDownEvent (#6611)

Browse Source 
* API: add DropDownEvent

(cherry picked from commit d44a45c916da391200f1ffad3f98b15a99abb1aa)

* request changes
This commit is contained in:
WayZer
2022-03-03 00:26:37 +08:00
committed by GitHub
parent 6c59018d9f
commit 4ff697e19b
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -156,6 +156,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
if(!u.isAdded()) u.team.data().updateCount(u.type, -1); if(!u.isAdded()) u.team.data().updateCount(u.type, -1);
u.add(); u.add();
u.unloaded(); u.unloaded();
Events.fire(new PayloadDropEvent(self(), u));
return true; return true;
} }
@@ -168,6 +169,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
if(on != null && Build.validPlace(tile.block, tile.team, tx, ty, tile.rotation, false)){ if(on != null && Build.validPlace(tile.block, tile.team, tx, ty, tile.rotation, false)){
int rot = (int)((rotation + 45f) / 90f) % 4; int rot = (int)((rotation + 45f) / 90f) % 4;
payload.place(on, rot); payload.place(on, rot);
Events.fire(new PayloadDropEvent(self(), tile));
if(getControllerName() != null){ if(getControllerName() != null){
payload.build.lastAccessed = getControllerName(); payload.build.lastAccessed = getControllerName();

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

@@ -242,6 +242,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 static class UnitControlEvent{
public final Player player; public final Player player;
public final @Nullable Unit unit; public final @Nullable Unit unit;