From c339a0ecdf078391e405e58dd4c5ba2b9845bc39 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 26 Dec 2019 20:44:05 -0500
Subject: [PATCH] Merge

---
 core/src/mindustry/entities/bullet/ArtilleryBulletType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
index 3a098e8765..c59dedf99a 100644
--- a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
+++ b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java
@@ -25,7 +25,7 @@ public class ArtilleryBulletType extends BasicBulletType{
     }
 
     @Override
-    public void update(mindustry.entities.type.Bullet b){
+    public void update(Bullet b){
         super.update(b);
 
         if(b.timer.get(0, 3 + b.fslope() * 2f)){