Create basic death feature & event (#6)

Minestom · Apr 18, 2022 · d84a8a4 · d84a8a4
1 parent 8ff4d2d
commit d84a8a4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,6 @@
 [*]
 charset = utf-8
-end_of_line = crlf
+end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false

diff --git a/src/main/java/net/minestom/arena/feature/CombatFeature.java b/src/main/java/net/minestom/arena/feature/CombatFeature.java
@@ -24,6 +24,7 @@ public void hook(@NotNull EventNode<Event> node) {
                 if (!playerCombat && event.getTarget() instanceof Player && event.getEntity() instanceof Player) return;
 
                 int damage = 1;
+
                 target.damage(DamageType.fromEntity(event.getEntity()), damage);
 
                 Hologram hologram = new Hologram(

diff --git a/src/main/java/net/minestom/arena/game/mob/MobArena.java b/src/main/java/net/minestom/arena/game/mob/MobArena.java
@@ -2,6 +2,8 @@
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.title.Title;
+import net.minestom.arena.Lobby;
+import net.minestom.arena.Messenger;
 import net.minestom.arena.feature.Feature;
 import net.minestom.arena.feature.Features;
 import net.minestom.arena.game.SingleInstanceArena;
@@ -12,6 +14,7 @@
 import net.minestom.server.entity.EntityCreature;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.entity.EntityDeathEvent;
+import net.minestom.server.event.player.PlayerDeathEvent;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.instance.block.Block;
@@ -60,6 +63,11 @@ public MobArena(Group group) {
             }
             nextStage();
         });
+
+        arenaInstance.eventNode().addListener(PlayerDeathEvent.class, event -> {
+            event.getPlayer().setInstance(Lobby.INSTANCE);
+            Messenger.info(event.getPlayer(), "You died. Your last stage was " + stage);
+        });
     }
 
     @Override