More achievement cleanup

core/src/mindustry/entities/comp/BulletComp.java

@@ -1,5 +1,6 @@
 package mindustry.entities.comp;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
@@ -9,10 +10,12 @@ import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.core.*;
 import mindustry.entities.bullet.*;
+import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.blocks.defense.Wall.*;
 
 import static mindustry.Vars.*;
 
@@ -104,6 +107,10 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         }
 
         type.hitEntity(self(), other, health);
+
+        if(owner instanceof WallBuild && player != null && team != player.team() && other instanceof Unit unit && unit.dead){
+            Events.fire(Trigger.phaseDeflectHit);
+        }
     }
 
     @Override

core/src/mindustry/entities/comp/PayloadComp.java

@@ -1,5 +1,6 @@
 package mindustry.entities.comp;
 
+import arc.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
@@ -8,6 +9,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
@@ -52,12 +54,14 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         if(Vars.net.client()){
             Vars.netClient.clearRemovedEntity(unit.id);
         }
+        Events.fire(new PickupEvent(self(), unit));
     }
 
     void pickup(Building tile){
         tile.tile.remove();
         payloads.add(new BuildPayload(tile));
         Fx.unitPickup.at(tile);
+        Events.fire(new PickupEvent(self(), tile));
     }
 
     boolean dropLastPayload(){