Merge pull request #12 from anhgelus/feat/spectating-players-moles-list

[Feat] Spectator can get the list of moles

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/world/anhgelus/molehunt/Molehunt.java b/src/main/java/world/anhgelus/molehunt/Molehunt.java
index 58c43f2..9026dab 100644
--- a/src/main/java/world/anhgelus/molehunt/Molehunt.java
+++ b/src/main/java/world/anhgelus/molehunt/Molehunt.java
@@ -139,7 +139,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;
         }));
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();