Fix main world items being lost on death in demo

Author: MattiDragon

changelog/1.1.1+1.21.1.md

@@ -0,0 +1 @@
+* Fixed an issue where player data could be lost upon dying in a demo

gradle.properties

@@ -5,7 +5,7 @@ minecraft_version=1.21.1
 yarn_mappings=1.21.1+build.3
 loader_version=0.16.10
 
-mod_version=1.1.0
+mod_version=1.1.1
 maven_group=io.github.mattidragon.demobox
 archives_base_name=DemoBox
 

src/main/java/io/github/mattidragon/demobox/DemoBoxGame.java

@@ -12,6 +12,7 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructurePlacementData;
 import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
@@ -33,6 +34,7 @@
 import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult;
 import xyz.nucleoid.plasmid.api.game.player.JoinOffer;
 import xyz.nucleoid.plasmid.api.game.player.JoinOfferResult;
+import xyz.nucleoid.stimuli.event.player.PlayerDeathEvent;
 
 import java.util.Arrays;
 import java.util.List;
@@ -67,6 +69,11 @@ private static GameOpenProcedure open(GameOpenContext<Settings> context) {
            activity.listen(GamePlayerEvents.JOIN, instance::onPlayerJoin);
            activity.listen(GamePlayerEvents.JOIN_MESSAGE, instance::onJoinMessage);
            activity.listen(GamePlayerEvents.LEAVE_MESSAGE, instance::onLeaveMessage);
+           activity.listen(PlayerDeathEvent.EVENT, (player, source) -> {
+               instance.gameSpace.getPlayers().kick(player);
+               player.sendMessage(Text.translatable("demobox.demo.death").formatted(Formatting.RED));
+               return ActionResult.FAIL;
+           });
        });
     }
 

src/main/resources/data/demobox/lang/en_us.json

@@ -2,6 +2,7 @@
   "command.demobox.open.fail": "Failed to open demo box",
   "demobox.demo.join": "%s joined the demo",
   "demobox.demo.leave": "%s left the game",
+  "demobox.demo.death": "You have died in the demo and thus removed from it. You can open another one if your want to.",
   "gameType.demobox.demo_box": "Demo Box",
 
   "demobox.info.1": "Welcome to the DemoBox!",