From c912eb197b0f36bfa7c0ff4458cfcaed65652238 Mon Sep 17 00:00:00 2001
From: LeoDog896 <LeoDog896@hotmail.com>
Date: Fri, 25 Sep 2020 12:01:59 -0400
Subject: [PATCH 1/2] Drown event

we all need to know when they drown
---
 core/src/mindustry/entities/comp/FlyingComp.java | 4 +++-
 core/src/mindustry/game/EventType.java           | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java
index 15d0e84b1e..7f8e8ca55b 100644
--- a/core/src/mindustry/entities/comp/FlyingComp.java
+++ b/core/src/mindustry/entities/comp/FlyingComp.java
@@ -1,10 +1,12 @@
 package mindustry.entities.comp;
 
+import arc.Events;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.world.blocks.environment.*;
 
@@ -90,7 +92,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
             //TODO is the netClient check necessary?
             if(drownTime >= 0.999f && !net.client()){
                 kill();
-                //TODO drown event!
+                Events.fire(new UnitDrownEvent(self()));
             }
         }else{
             drownTime = Mathf.lerpDelta(drownTime, 0f, 0.03f);
diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index b2e26c9b1f..1739bb1fd1 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -270,6 +270,14 @@ public class EventType{
         }
     }
 
+    public static class UnitDrownEvent{
+        public final Unit unit;
+
+        public UnitDrownEvent(Unit unit){
+            this.unit = unit;
+        }
+    }
+
     public static class UnitCreateEvent{
         public final Unit unit;
 

From 1d52211f9304eb4cd6c53f1c4ca04b93ebda7840 Mon Sep 17 00:00:00 2001
From: LeoDog896 <LeoDog896@hotmail.com>
Date: Fri, 25 Sep 2020 14:21:48 -0400
Subject: [PATCH 2/2] Update core/src/mindustry/entities/comp/FlyingComp.java

Co-authored-by: Summet <summet.dev@gmail.com>
---
 core/src/mindustry/entities/comp/FlyingComp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java
index 7f8e8ca55b..83c16d3525 100644
--- a/core/src/mindustry/entities/comp/FlyingComp.java
+++ b/core/src/mindustry/entities/comp/FlyingComp.java
@@ -1,6 +1,6 @@
 package mindustry.entities.comp;
 
-import arc.Events;
+import arc.*;
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;