SteamWar/FightSystem
Archiviert
13
1

Meteor #324

Zusammengeführt
Lixfel hat 24 Commits von Meteor nach master 2022-02-11 22:48:17 +01:00 zusammengeführt
Nur Änderungen aus Commit 15a1caf8b3 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -64,7 +64,8 @@ public class Meteor implements Listener {
TNTPrimed tnt = world.spawn(event.getEntity().getLocation(), TNTPrimed.class); TNTPrimed tnt = world.spawn(event.getEntity().getLocation(), TNTPrimed.class);
tnt.setVelocity(new Vector(0, 0, 0)); tnt.setVelocity(new Vector(0, 0, 0));
tnt.setFuseTicks(0); tnt.setFuseTicks(0);
tnt.setYield(current.explosionSize); tnt.setYield(((Fireball) event.getEntity()).getYield());
event.getEntity().remove();
} }
} }
@ -91,14 +92,14 @@ public class Meteor implements Listener {
fireballRed.setDirection(vector); fireballRed.setDirection(vector);
fireballRed.setBounce(false); fireballRed.setBounce(false);
fireballRed.setIsIncendiary(false); fireballRed.setIsIncendiary(false);
fireballRed.setYield(0); fireballRed.setYield(current.explosionSize);
Fireball fireballBlue = world.spawn(blueStart.toLocation(world), Fireball.class); Fireball fireballBlue = world.spawn(blueStart.toLocation(world), Fireball.class);
vector.setZ(vector.getZ() * -1); vector.setZ(vector.getZ() * -1);
fireballBlue.setDirection(vector); fireballBlue.setDirection(vector);
fireballBlue.setBounce(false); fireballBlue.setBounce(false);
fireballBlue.setIsIncendiary(false); fireballBlue.setIsIncendiary(false);
fireballBlue.setYield(0); fireballBlue.setYield(current.explosionSize);
if (amount.decrementAndGet() <= 0) { if (amount.decrementAndGet() <= 0) {
currentDropping.cancel(); currentDropping.cancel();