Merge pull request #83 from sheenhm/main

PurpleBananass · Oct 20, 2023 · 61bd228 · 61bd228
2 parents 86c343f + 0b240b9
commit 61bd228
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/src/entity/Ship.java b/src/entity/Ship.java
@@ -138,13 +138,6 @@ public final void update() {
 		else
 			this.spriteType = SpriteType.Ship;
 	}
-	public final void updatep_2() {
-		this.skillCooldown.checkFinished();
-		if (!this.destructionCooldown.checkFinished())
-			this.spriteType = SpriteType.ShipDestroyed;
-		else
-			this.spriteType = SpriteType.Ship2;
-	}
 
 	/**
 	 * Switches the ship to its destroyed state.

diff --git a/src/screen/GameScreen.java b/src/screen/GameScreen.java
@@ -636,7 +636,7 @@ else if (this.enemyShipSpecialExplosionCooldown.checkFinished()) {
 
 				this.ship.update();
 				if (this.gameState.getMode() == 2) {
-					this.ship2.updatep_2();
+					this.ship2.update();
 				}
 
 				this.enemyShipFormation.update();