File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed
src/main/java/com/github/elic0de/thejpspit/spigot Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change 77import java .math .BigDecimal ;
88import java .util .HashSet ;
99import java .util .Set ;
10+ import org .bukkit .Location ;
1011
1112public 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 ();
Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments