Merge branch 'release/0.1.1'

FroxyProject · Apr 20, 2019 · 3edc728 · 3edc728
2 parents 54b0afb + 4e66252
commit 3edc728
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 .project
 .settings/
 /bin/
-/LOGS.txt
+/LOGS.txt
+/bin/
diff --git a/src/main/java/com/froxynetwork/froxynetwork/network/output/data/PlayerDataOutput.java b/src/main/java/com/froxynetwork/froxynetwork/network/output/data/PlayerDataOutput.java
@@ -36,7 +36,7 @@ public class PlayerDataOutput extends GeneralDataOutput<PlayerDataOutput.Player>
 	@AllArgsConstructor
 	public static class Player {
 		private String uuid;
-		private String pseudo;
+		private String nickname;
 		private String displayName;
 		private int coins;
 		private int level;