Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

Author: OptiJava

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java

@@ -85,7 +85,6 @@ public void onPlayerLoggedIn(ServerPlayerEntity player) {
                     break;
                 }
             }
-
             player.setGameMode(gameMode);
         }
     }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/disabledLayEggs/ChickenEntity_Mixin.java

@@ -8,10 +8,10 @@
 
 @Mixin(ChickenEntity.class)
 public class ChickenEntity_Mixin {
-    @Inject(at = @At("HEAD"), method = "tickMovement")
+    @Inject(at = @At("HEAD"), method = "tickMovement()V")
     public void injectTickMovement() {
         if (OptCarpetSettings.disabledLayEggs) {
-            ((ChickenEntity) (Object) this).eggLayTime = 50;
+            ((ChickenEntity) (Object) this).eggLayTime = 100;
         }
     }
 }

src/main/java/io/github/optijava/opt_carpet_addition/mixins/showDetailWhenFakePlayerJoin/PlayerCommand_Mixin.java

@@ -0,0 +1,26 @@
+package io.github.optijava.opt_carpet_addition.mixins.showDetailWhenFakePlayerJoin;
+
+import carpet.CarpetServer;
+import carpet.commands.PlayerCommand;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
+import net.minecraft.server.command.ServerCommandSource;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(PlayerCommand.class)
+public class PlayerCommand_Mixin {
+    @Inject(at = @At("TAIL"), method = "spawn(Lcom/mojang/brigadier/context/CommandContext;)I", cancellable = true)
+    public void injectSpawn(CommandContext<ServerCommandSource> context, CallbackInfo info) {
+        if (context.getSource().getEntity() == null) {
+            CarpetServer.minecraft_server.getCommandManager().execute(CarpetServer.minecraft_server.getCommandSource(), "tell @a Unexpected exception occurred when show fake player details: Can't show details because 'context.getSource().getEntity()' is null.");
+            OptCarpetAddition.LOGGER.warn("Unexpected exception occurred when show fake player details: Can't show details because 'context.getSource().getEntity()' is null.");
+            info.cancel();
+        }
+        CarpetServer.minecraft_server.getCommandManager().execute(CarpetServer.minecraft_server.getCommandSource(), "tell @a Fake player " + StringArgumentType.getString(context, "player") + " was summoned by " + context.getSource().getName() + " in " + context.getSource().getWorld().toString() + "@" + context.getSource().getEntity().getX() + "/" + context.getSource().getEntity().getY() + "/" + context.getSource().getEntity().getZ());
+        OptCarpetAddition.LOGGER.info("Fake player " + StringArgumentType.getString(context, "player") + " was summoned by " + context.getSource().getName() + " in " + context.getSource().getWorld().toString() + "@" + context.getSource().getEntity().getX() + "/" + context.getSource().getEntity().getY() + "/" + context.getSource().getEntity().getZ());
+    }
+}