Skip to content

Commit 98509dc

Browse files
committed
奈落で死ぬと2回死亡判定になるのを修正
1 parent c9fb6a7 commit 98509dc

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/main/java/com/github/elic0de/thejpspit/spigot/game/Game.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.math.BigDecimal;
88
import java.util.HashSet;
99
import java.util.Set;
10+
import org.bukkit.Location;
1011

1112
public class Game {
1213

@@ -36,6 +37,13 @@ public void leave(PitPlayer player) {
3637
public void death(PitPlayer player) {
3738
final PitPlayer killer = player.getKiller();
3839

40+
// 死んだらテレポートをさせる
41+
pit.getPitPreferences().ifPresent(pitPreferences -> {
42+
final Location location = pitPreferences.getSpawn().get().getLocation();
43+
44+
if (location != null) player.getPlayer().teleport(location);
45+
});
46+
3947
if (killer == null) {
4048
player.increaseDeaths();
4149
player.resetItem();

src/main/java/com/github/elic0de/thejpspit/spigot/listener/EventListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ public void onDrop(PlayerDropItemEvent event) {
140140
public void onDamage(EntityDamageEvent event) {
141141
if (event.getEntity() instanceof Player vitim) {
142142
if (event.getCause() == DamageCause.VOID) {
143-
vitim.setHealth(0);
143+
final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim);
144+
plugin.getGame().death(victimPitPlayer);
144145
}
145146
}
146147
}

0 commit comments

Comments
 (0)