Merge branch '1.18' into 1.19

# Conflicts: # gradle.properties
sisby-folk · Sep 14, 2022 · 0cbca35 · 0cbca35
2 parents e442299 + ec2f8d9
commit 0cbca35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.3.4+1.19
+version = 1.3.5+1.19
 maven_group = folk.sisby
 archives_base_name = switchy
 

diff --git a/src/main/java/folk/sisby/switchy/SwitchyCommands.java b/src/main/java/folk/sisby/switchy/SwitchyCommands.java
@@ -188,7 +188,7 @@ private static int setPreset(ServerPlayerEntity player, SwitchyPresets presets,
 
 		String oldPresetName = Objects.toString(presets.getCurrentPreset(), "<None>");
 		presets.setCurrentPreset(player, presetName, true);
-		Switchy.LOGGER.info("[Switchy] Player switch: '" + oldPresetName + "' -> '" + presetName + "' [" + player.getUuid() + "]");
+		Switchy.LOGGER.info("[Switchy] Player switch: '" + oldPresetName + "' -> '" + presetName + "' [" + player.getGameProfile().getName() + "]");
 		tellSuccess(player, "commands.switchy.set.success", literal(oldPresetName), literal(presetName));
 		return 1;
 	}

diff --git a/src/main/java/folk/sisby/switchy/modules/DrogtorCompat.java b/src/main/java/folk/sisby/switchy/modules/DrogtorCompat.java
@@ -34,7 +34,7 @@ public void updateFromPlayer(PlayerEntity player) {
 	@Override
 	public void applyToPlayer(PlayerEntity player) {
 		DrogtorPlayer drogtorPlayer = (DrogtorPlayer) player;
-		Switchy.LOGGER.info("[Switchy] Player Nickname Change: '" + player.getDisplayName() + "' -> '" + this.nickname + "'");
+		Switchy.LOGGER.info("[Switchy] Player Nickname Change: '" + player.getDisplayName().getString() + "' -> '" + this.nickname + "' [" + player.getGameProfile().getName() + "]");
 		drogtorPlayer.drogtor$setNickname(this.nickname);
 		drogtorPlayer.drogtor$setNameColor(this.namecolor);
 		drogtorPlayer.drogtor$setBio(this.bio);