From 2296148b0612ebad0b927bd7d27ad9c8f09b172b Mon Sep 17 00:00:00 2001
From: anhgelus <anhgelus.morhtuuzh@proton.me>
Date: Sun, 25 Aug 2024 14:43:47 +0000
Subject: feat(game): spectator can get the list of moles

---
 src/main/java/world/anhgelus/molehunt/Molehunt.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/world/anhgelus/molehunt/Molehunt.java b/src/main/java/world/anhgelus/molehunt/Molehunt.java
index 52399dc..d94e523 100644
--- a/src/main/java/world/anhgelus/molehunt/Molehunt.java
+++ b/src/main/java/world/anhgelus/molehunt/Molehunt.java
@@ -134,7 +134,10 @@ public class Molehunt implements ModInitializer {
                     return Command.SINGLE_SUCCESS;
                 })
         ));
-        command.then(literal("moles").requires(source -> game != null && game.isAMole(source.getPlayer())).executes(context -> {
+        command.then(literal("moles").requires(source ->
+                (game != null && game.isAMole(source.getPlayer())) ||
+                        (source.getPlayer() != null && source.getPlayer().isSpectator())
+        ).executes(context -> {
             context.getSource().sendFeedback(() -> Text.translatable("commands.molehunt.moles.list").append(" " + game.getMolesAsString()),false);
             return Command.SINGLE_SUCCESS;
         }));
-- 
cgit v1.2.3


From 76dc1da882200f0349d5fdaf22ddcc7304f1e591 Mon Sep 17 00:00:00 2001
From: anhgelus <anhgelus.morhtuuzh@proton.me>
Date: Sun, 25 Aug 2024 14:48:50 +0000
Subject: fix(game): player not properly cleared

---
 src/main/java/world/anhgelus/molehunt/game/Game.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/world/anhgelus/molehunt/game/Game.java b/src/main/java/world/anhgelus/molehunt/game/Game.java
index a2fdfbb..0bc7270 100644
--- a/src/main/java/world/anhgelus/molehunt/game/Game.java
+++ b/src/main/java/world/anhgelus/molehunt/game/Game.java
@@ -57,7 +57,6 @@ public class Game {
         gamerules.get(GameRules.ANNOUNCE_ADVANCEMENTS).set(false, server);
         // gamerules for the start
         gamerules.get(GameRules.DO_IMMEDIATE_RESPAWN).set(true, server);
-        gamerules.get(GameRules.DO_ENTITY_DROPS).set(false, server);
 
         final var worldBorder = server.getOverworld().getWorldBorder();
         worldBorder.setSize(Molehunt.CONFIG.getInitialWorldSize());
@@ -76,6 +75,7 @@ public class Game {
 
         final var title = new TitleS2CPacket(Text.translatable("molehunt.game.start.suspense"));
         playerManager.getPlayerList().forEach(p -> {
+            p.getInventory().clear();
             p.kill();
             p.networkHandler.sendPacket(timing);
             p.networkHandler.sendPacket(title);
@@ -103,7 +103,6 @@ public class Game {
                 });
                 // reset gamerules after the start
                 gamerules.get(GameRules.DO_IMMEDIATE_RESPAWN).set(false, server);
-                gamerules.get(GameRules.DO_ENTITY_DROPS).set(true, server);
                 // reset time and weather
                 server.getOverworld().setTimeOfDay(0);
                 server.getOverworld().resetWeather();
-- 
cgit v1.2.3