1.0.2: Fix server crashing when player left in an unlucky situation :(

Minor cleanup
onebeastchris · Nov 12, 2023 · 55ef1d3 · 55ef1d3
1 parent 7d804e8
commit 55ef1d3
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 59 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20+build.1
 loader_version=0.14.21
 
 # Mod Properties
-mod_version=1.0.0
+mod_version=1.0.2
 maven_group=net.onebeastofchris
 archives_base_name=visitors
 

diff --git a/src/main/java/onebeastchris/command/discordCommand.java b/src/main/java/onebeastchris/command/discordCommand.java
@@ -20,15 +20,15 @@ public static LiteralCommandNode register(CommandDispatcher<ServerCommandSource>
     }
 
     public static int discordCommand(ServerCommandSource source) {
-        Supplier<Text> initialText = () -> Text.of(visitors.config.getDiscordInviteMessage());
-        Supplier<Text> mutableText = () -> {
+        Supplier<Text> discordInviteMessage = () -> Text.of(visitors.config.getDiscordInviteMessage());
+        Supplier<Text> discordLink = () -> {
             Text link = Text.of("[" + visitors.config.getInviteLink() + "]");
             MutableText text = link.copy().styled((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, visitors.config.getInviteLink())));
             return text.setStyle(text.getStyle().withColor(Formatting.GOLD));
         };
 
-        source.sendFeedback(initialText, false);
-        source.sendFeedback(mutableText, false);
+        source.sendFeedback(discordInviteMessage, false);
+        source.sendFeedback(discordLink, false);
 
         return 1;
     }

diff --git a/src/main/java/onebeastchris/event/ServerJoinEvent.java b/src/main/java/onebeastchris/event/ServerJoinEvent.java
@@ -21,23 +21,21 @@ public static void register() {
 
             if (PlayerDataUtil.isVisitor(profile)) {
                 visitors.LOGGER.info(profile.getName() + " joined the server as a visitor.");
-                if (PlayerDataUtil.isVisitor(profile)) {
-                    PlayerDataUtil.addPlayer(profile, player);
-
-                    tempStorage.put(player, new PlayerInfoStorage(
-                                    player.getCustomName(),
-                                    player.getServerWorld(),
-                                    new int[]{player.getBlockPos().getX(), player.getBlockPos().getY(), player.getBlockPos().getZ()})
-                    );
-
-                    player.changeGameMode(GameMode.SPECTATOR);
-                    player.setCustomName(Text.of("Visitor: " + player.getGameProfile().getName()));
-                    player.setCustomNameVisible(true);
-
-                    // calling this once to ensure players see... something.
-                    player.sendMessage(Text.of(visitors.config.getWelcomeVisitorMessage1()), true);
-                }
+                PlayerDataUtil.addVisitor(profile, player);
+
+                tempStorage.put(player, new PlayerInfoStorage(
+                                player.getPlayerListName(),
+                                player.getServerWorld(),
+                                player.getPos())
+                );
+
+                player.changeGameMode(GameMode.SPECTATOR);
+                player.setCustomName(Text.of("Visitor: " + player.getGameProfile().getName()));
+                player.setCustomNameVisible(true);
+
+                // calling this once to ensure players see... something.
+                player.sendMessage(Text.of(visitors.config.getWelcomeVisitorMessage1()), true);
             }
-    });
+        });
     }
 }
diff --git a/src/main/java/onebeastchris/event/ServerLeaveEvent.java b/src/main/java/onebeastchris/event/ServerLeaveEvent.java
@@ -24,18 +24,15 @@ public static void register() {
 
     public static void onLeave(ServerPlayerEntity player, GameProfile profile){
         PlayerDataUtil.removeVisitor(profile);
-        PlayerInfoStorage storage = ServerJoinEvent.tempStorage.get(player);
+        PlayerInfoStorage storage = ServerJoinEvent.tempStorage.remove(player);
 
-        int x = storage.position()[0];
-        int y = storage.position()[1];
-        int z = storage.position()[2];
+        double x = storage.position().getX();
+        double y = storage.position().getY();
+        double z = storage.position().getZ();
 
         player.teleport(storage.world(), x, y, z, 0, 0);
         player.changeGameMode(GameMode.DEFAULT);
         player.sendMessage(Text.of(visitors.config.getWelcomeMemberMessage()), true);
         player.setCustomName(storage.name());
-
-        PlayerDataUtil.removeVisitor(profile);
-        ServerJoinEvent.tempStorage.remove(player);
     }
 }
diff --git a/src/main/java/onebeastchris/event/Timer.java b/src/main/java/onebeastchris/event/Timer.java
@@ -21,7 +21,10 @@ public static void register() {
     }
     public static void sendMessageToVisitors(String message){
         for (ServerPlayerEntity player : PlayerDataUtil.visitorMap.values()){
-            player.sendMessage(Text.of(message), true);
+            // Could happen if unlucky, let's not crash the server.
+            if (player != null) {
+                player.sendMessage(Text.of(message), true);
+            }
         }
     }
 }
diff --git a/src/main/java/onebeastchris/mixin/PlayerManagerMixin.java b/src/main/java/onebeastchris/mixin/PlayerManagerMixin.java
@@ -11,7 +11,7 @@ public class PlayerManagerMixin {
 	@Redirect(method = "checkCanJoin", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;isWhitelisted(Lcom/mojang/authlib/GameProfile;)Z"))
 	private boolean visitors$isWhitelisted(PlayerManager instance, GameProfile profile) {
 		if (!instance.isWhitelisted(profile)) {
-			PlayerDataUtil.addVisitor(profile, null);
+			PlayerDataUtil.addFutureVisitor(profile);
 		}
 		return true;
 	}

diff --git a/src/main/java/onebeastchris/mixin/ServerConfigListMixin.java b/src/main/java/onebeastchris/mixin/ServerConfigListMixin.java
@@ -17,14 +17,14 @@ public abstract class ServerConfigListMixin {
 
     @Inject(method = "add", at = @At("TAIL"))
     private void add(ServerConfigEntry<?> entry, CallbackInfo ci) {
-            if (entry instanceof WhitelistEntry whitelistEntry) {
-                try {
-                    GameProfile profile = ((ServerConfigEntryMixin.ServerConfigEntryInvoker<GameProfile>) whitelistEntry).callGetKey();
-                    visitors.LOGGER.debug("WhitelistEntry: " + profile.getName());
-                    PlayerDataUtil.changeStatus(profile);
-                } catch (Exception e) {
-                    visitors.LOGGER.error("Error getting GameProfile from WhitelistEntry", e);
-                }
+        if (entry instanceof WhitelistEntry whitelistEntry) {
+            try {
+                GameProfile profile = ((ServerConfigEntryMixin.ServerConfigEntryInvoker<GameProfile>) whitelistEntry).callGetKey();
+                visitors.LOGGER.debug("WhitelistEntry: " + profile.getName());
+                PlayerDataUtil.changeStatus(profile);
+            } catch (Exception e) {
+                visitors.LOGGER.error("Error getting GameProfile from WhitelistEntry", e);
             }
+        }
     }
 }
diff --git a/src/main/java/onebeastchris/util/ConfigUtil.java b/src/main/java/onebeastchris/util/ConfigUtil.java
@@ -10,7 +10,6 @@
 
 public class ConfigUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger("visitors");
-
     private boolean discordCommand;
     private String inviteLink;
     //private boolean useCustomAdventure;

diff --git a/src/main/java/onebeastchris/util/PlayerDataUtil.java b/src/main/java/onebeastchris/util/PlayerDataUtil.java
@@ -10,12 +10,11 @@ public class PlayerDataUtil {
 
     public static HashMap<GameProfile, ServerPlayerEntity> visitorMap = new HashMap<>();
 
-    public static void addVisitor(GameProfile gameProfile, ServerPlayerEntity player){
-        visitorMap.put(gameProfile, player);
+    public static void addFutureVisitor(GameProfile gameProfile){
+        visitorMap.put(gameProfile, null);
     }
 
-    public static void addPlayer(GameProfile gameProfile, ServerPlayerEntity player){
-        visitorMap.remove(gameProfile, null);
+    public static void addVisitor(GameProfile gameProfile, ServerPlayerEntity player){
         visitorMap.put(gameProfile, player);
     }
 

diff --git a/src/main/java/onebeastchris/util/PlayerInfoStorage.java b/src/main/java/onebeastchris/util/PlayerInfoStorage.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
+import net.minecraft.util.math.Vec3d;
 
-public record PlayerInfoStorage(Text name, ServerWorld world, int[] position) {
+public record PlayerInfoStorage(Text name, ServerWorld world, Vec3d position) {
 }
diff --git a/src/main/java/onebeastchris/visitors.java b/src/main/java/onebeastchris/visitors.java
@@ -7,22 +7,12 @@
 import org.slf4j.LoggerFactory;
 
 public class visitors implements ModInitializer {
-	// This logger is used to write text to the console and the log file.
-	// It is considered best practice to use your mod id as the logger's name.
-	// That way, it's clear which mod wrote info, warnings, and errors.
 	public static final Logger LOGGER = LoggerFactory.getLogger("visitors");
 
 	public static ConfigUtil config = new ConfigUtil();
 
-
-
 	@Override
 	public void onInitialize() {
-		// This code runs as soon as Minecraft is in a mod-load-ready state.
-		// However, some things (like resources) may still be uninitialized.
-		// Proceed with mild caution.
-
-
 		LOGGER.info("Loading visitors");
 		Register.registerAll();
 	}

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -8,10 +8,9 @@
 		"onebeastchris"
 	],
 	"contact": {
-		"homepage": "https://fabricmc.net/",
-		"sources": "https://github.com/FabricMC/fabric-example-mod"
+		"sources": "https://github.com/onebeastchris/visitors"
 	},
-	"license": "CC0-1.0",
+	"license": "MIT",
 	"icon": "assets/a_119.3test/icon.png",
 	"environment": "*",
 	"entrypoints": {

diff --git a/src/main/resources/visitors.main.mixins.json b/src/main/resources/visitors.main.mixins.json
@@ -9,5 +9,5 @@
   ],
   "injectors": {
     "defaultRequire": 1
-	}
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ @@
       ],
       "injectors": {
         "defaultRequire": 1
-    	}
+      }
     }