Skip to content

Commit 5072c8c

Browse files
committed
account for creative/spectator when in void
1 parent e22dd4d commit 5072c8c

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

type.generic/src/main/java/net/swofty/types/generic/event/actions/player/fall/ActionPlayerVoid.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ public class ActionPlayerVoid implements SkyBlockEventClass {
1515
public void run(PlayerMoveEvent event) {
1616
final SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
1717

18-
if (player.getPosition().y() <= -1) {
19-
player.damage(DamageType.OUT_OF_WORLD, 1000000000);
20-
21-
if (player.getGameMode() == GameMode.CREATIVE)
22-
player.sendTo(SkyBlockConst.getTypeLoader().getType());
18+
if (player.getPosition().y() < 0 && player.getGameMode() != GameMode.CREATIVE && player.getGameMode() != GameMode.SPECTATOR) {
19+
player.kill();
2320
}
2421
}
2522
}

type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockPlayer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,16 +756,15 @@ public void kill() {
756756
setHealth(getMaxHealth());
757757
sendTo(SkyBlockConst.getTypeLoader().getType());
758758

759-
if (SkyBlockConst.isIslandServer()) return;
760-
761759
DeathMessageCreator creator = new DeathMessageCreator(this.lastDamage);
762-
763760
sendMessage("§c☠ §7You " + creator.createPersonal());
764761

765762
getDeathData().increase(this.lastDamage, 1);
766763

767764
playSound(Sound.sound(Key.key("block.anvil.fall"), Sound.Source.PLAYER, 1.0f, 2.0f));
768765

766+
if (SkyBlockConst.isIslandServer()) return;
767+
769768
if (!isBoosterCookieActive()) {
770769
sendMessage("§cYou died and lost " + StringUtility.decimalify(getCoins() / 2, 1) + " coins!");
771770
setCoins(getCoins() / 2);

0 commit comments

Comments
 (0)