From b819e70b55ba71f00994be962ed02c2b280605bd Mon Sep 17 00:00:00 2001 From: Dawson Vilamaa Date: Wed, 10 Jul 2024 21:51:14 -0400 Subject: [PATCH] Fixed bug reading player data from earlier versions --- 1_14_R1/dependency-reduced-pom.xml | 20 +++++++++++++ 1_14_R1/pom.xml | 2 +- 1_15_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_15_R1/pom.xml | 2 +- 1_16_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_16_R1/pom.xml | 2 +- 1_16_R2/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_16_R2/pom.xml | 2 +- 1_16_R3/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_16_R3/pom.xml | 2 +- 1_17_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_17_R1/pom.xml | 2 +- 1_18_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_18_R1/pom.xml | 2 +- 1_18_R2/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_18_R2/pom.xml | 2 +- 1_19_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_19_R1/pom.xml | 2 +- 1_19_R2/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_19_R2/pom.xml | 2 +- 1_19_R3/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_19_R3/pom.xml | 2 +- 1_20_R1/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_20_R1/pom.xml | 2 +- 1_20_R2/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_20_R2/pom.xml | 2 +- 1_20_R3/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_20_R3/pom.xml | 2 +- 1_20_R4/dependency-reduced-pom.xml | 28 ++++++++++++++++++ 1_20_R4/pom.xml | 2 +- 1_21_R1/pom.xml | 2 +- Build/dependency-reduced-pom.xml | 2 +- Build/pom.xml | 2 +- README.md | 4 +++ VersionWrapper/pom.xml | 2 +- .../version/VersionMatcher.class | Bin 2138 -> 0 bytes .../version/VersionWrapper.class | Bin 350 -> 0 bytes .../compile/default-compile/createdFiles.lst | 2 -- .../compile/default-compile/inputFiles.lst | 2 -- changelog.txt | 17 +---------- core/dependency-reduced-pom.xml | 2 +- core/pom.xml | 2 +- .../dawsonvilamaa/beaconwaypoint/Main.java | 2 +- .../listeners/WorldListener.java | 2 +- core/src/main/resources/plugin.yml | 2 +- pom.xml | 2 +- todo.txt | 15 ++-------- 47 files changed, 444 insertions(+), 58 deletions(-) create mode 100644 1_14_R1/dependency-reduced-pom.xml create mode 100644 1_15_R1/dependency-reduced-pom.xml create mode 100644 1_16_R1/dependency-reduced-pom.xml create mode 100644 1_16_R2/dependency-reduced-pom.xml create mode 100644 1_16_R3/dependency-reduced-pom.xml create mode 100644 1_17_R1/dependency-reduced-pom.xml create mode 100644 1_18_R1/dependency-reduced-pom.xml create mode 100644 1_18_R2/dependency-reduced-pom.xml create mode 100644 1_19_R1/dependency-reduced-pom.xml create mode 100644 1_19_R2/dependency-reduced-pom.xml create mode 100644 1_19_R3/dependency-reduced-pom.xml create mode 100644 1_20_R1/dependency-reduced-pom.xml create mode 100644 1_20_R2/dependency-reduced-pom.xml create mode 100644 1_20_R3/dependency-reduced-pom.xml create mode 100644 1_20_R4/dependency-reduced-pom.xml delete mode 100644 VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionMatcher.class delete mode 100644 VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionWrapper.class delete mode 100644 VersionWrapper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 VersionWrapper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/1_14_R1/dependency-reduced-pom.xml b/1_14_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..845d919 --- /dev/null +++ b/1_14_R1/dependency-reduced-pom.xml @@ -0,0 +1,20 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_14_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + 8 + 8 + + diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml index d872246..d76af91 100644 --- a/1_14_R1/pom.xml +++ b/1_14_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_14_R1 diff --git a/1_15_R1/dependency-reduced-pom.xml b/1_15_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..a5a398e --- /dev/null +++ b/1_15_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_15_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.15-R0.1-SNAPSHOT + provided + + + + 8 + 8 + + diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml index c99012d..26d120e 100644 --- a/1_15_R1/pom.xml +++ b/1_15_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_15_R1 diff --git a/1_16_R1/dependency-reduced-pom.xml b/1_16_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..6d1d663 --- /dev/null +++ b/1_16_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_16_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.16.1-R0.1-SNAPSHOT + provided + + + + 8 + 8 + + diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml index 4878bdf..137bd66 100644 --- a/1_16_R1/pom.xml +++ b/1_16_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_16_R1 diff --git a/1_16_R2/dependency-reduced-pom.xml b/1_16_R2/dependency-reduced-pom.xml new file mode 100644 index 0000000..26decfb --- /dev/null +++ b/1_16_R2/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_16_R2 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.16.2-R0.1-SNAPSHOT + provided + + + + 8 + 8 + + diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml index 2cb24d8..b4a8956 100644 --- a/1_16_R2/pom.xml +++ b/1_16_R2/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_16_R2 diff --git a/1_16_R3/dependency-reduced-pom.xml b/1_16_R3/dependency-reduced-pom.xml new file mode 100644 index 0000000..0c04839 --- /dev/null +++ b/1_16_R3/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_16_R3 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.16.4-R0.1-SNAPSHOT + provided + + + + 8 + 8 + + diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml index 819828d..54d1606 100644 --- a/1_16_R3/pom.xml +++ b/1_16_R3/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_16_R3 diff --git a/1_17_R1/dependency-reduced-pom.xml b/1_17_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..92bf8ca --- /dev/null +++ b/1_17_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_17_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.17.1-R0.1-SNAPSHOT + provided + + + + 16 + 16 + + diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml index 5ba5f5f..13bc027 100644 --- a/1_17_R1/pom.xml +++ b/1_17_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_17_R1 diff --git a/1_18_R1/dependency-reduced-pom.xml b/1_18_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..9c06017 --- /dev/null +++ b/1_18_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_18_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.18.1-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_18_R1/pom.xml b/1_18_R1/pom.xml index d430adb..d0c4e27 100644 --- a/1_18_R1/pom.xml +++ b/1_18_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_18_R1 diff --git a/1_18_R2/dependency-reduced-pom.xml b/1_18_R2/dependency-reduced-pom.xml new file mode 100644 index 0000000..ea1f7fc --- /dev/null +++ b/1_18_R2/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_18_R2 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.18.2-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_18_R2/pom.xml b/1_18_R2/pom.xml index 5e22da4..6c5258c 100644 --- a/1_18_R2/pom.xml +++ b/1_18_R2/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_18_R2 diff --git a/1_19_R1/dependency-reduced-pom.xml b/1_19_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..a210012 --- /dev/null +++ b/1_19_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_19_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.19.1-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_19_R1/pom.xml b/1_19_R1/pom.xml index 9351817..27b00c4 100644 --- a/1_19_R1/pom.xml +++ b/1_19_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_19_R1 diff --git a/1_19_R2/dependency-reduced-pom.xml b/1_19_R2/dependency-reduced-pom.xml new file mode 100644 index 0000000..b755905 --- /dev/null +++ b/1_19_R2/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_19_R2 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.19.3-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_19_R2/pom.xml b/1_19_R2/pom.xml index 1d07aa5..99204bc 100644 --- a/1_19_R2/pom.xml +++ b/1_19_R2/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_19_R2 diff --git a/1_19_R3/dependency-reduced-pom.xml b/1_19_R3/dependency-reduced-pom.xml new file mode 100644 index 0000000..ee67f49 --- /dev/null +++ b/1_19_R3/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_19_R3 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.19.4-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_19_R3/pom.xml b/1_19_R3/pom.xml index 4837d20..3f51a99 100644 --- a/1_19_R3/pom.xml +++ b/1_19_R3/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_19_R3 diff --git a/1_20_R1/dependency-reduced-pom.xml b/1_20_R1/dependency-reduced-pom.xml new file mode 100644 index 0000000..6cb67fc --- /dev/null +++ b/1_20_R1/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_20_R1 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.20.1-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_20_R1/pom.xml b/1_20_R1/pom.xml index 9521acd..13ec587 100644 --- a/1_20_R1/pom.xml +++ b/1_20_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_20_R1 diff --git a/1_20_R2/dependency-reduced-pom.xml b/1_20_R2/dependency-reduced-pom.xml new file mode 100644 index 0000000..4c7b31b --- /dev/null +++ b/1_20_R2/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_20_R2 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.20.2-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_20_R2/pom.xml b/1_20_R2/pom.xml index 15a7e10..3e9a69b 100644 --- a/1_20_R2/pom.xml +++ b/1_20_R2/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_20_R2 diff --git a/1_20_R3/dependency-reduced-pom.xml b/1_20_R3/dependency-reduced-pom.xml new file mode 100644 index 0000000..a753b8c --- /dev/null +++ b/1_20_R3/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_20_R3 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.20.4-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_20_R3/pom.xml b/1_20_R3/pom.xml index 6fd0e15..1992026 100644 --- a/1_20_R3/pom.xml +++ b/1_20_R3/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_20_R3 diff --git a/1_20_R4/dependency-reduced-pom.xml b/1_20_R4/dependency-reduced-pom.xml new file mode 100644 index 0000000..1aa7453 --- /dev/null +++ b/1_20_R4/dependency-reduced-pom.xml @@ -0,0 +1,28 @@ + + + + BeaconWaypoints + com.github.dawsonvilamaa + 1.7.1 + + 4.0.0 + 1_20_R4 + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + + org.spigotmc + spigot + 1.20.6-R0.1-SNAPSHOT + provided + + + + 17 + 17 + + diff --git a/1_20_R4/pom.xml b/1_20_R4/pom.xml index 3550979..eda4c74 100644 --- a/1_20_R4/pom.xml +++ b/1_20_R4/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_20_R4 diff --git a/1_21_R1/pom.xml b/1_21_R1/pom.xml index addb740..59cfb2d 100644 --- a/1_21_R1/pom.xml +++ b/1_21_R1/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 1_21_R1 diff --git a/Build/dependency-reduced-pom.xml b/Build/dependency-reduced-pom.xml index a3d2da4..3240cc8 100644 --- a/Build/dependency-reduced-pom.xml +++ b/Build/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 4.0.0 Build diff --git a/Build/pom.xml b/Build/pom.xml index ffe58dc..dabc5b5 100644 --- a/Build/pom.xml +++ b/Build/pom.xml @@ -5,7 +5,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 4.0.0 diff --git a/README.md b/README.md index 74d5749..c1257b8 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,10 @@ Note: If WorldEdit is used to delete a beacon, the waypoint will not be deleted. ## Changelog +### 1.7.1 +Fixes: +- Fixed error when reading player JSON files that were created in a previous version + ### 1.7 Changes: - Added support for 1.20.6 diff --git a/VersionWrapper/pom.xml b/VersionWrapper/pom.xml index aba745d..e5d22c2 100644 --- a/VersionWrapper/pom.xml +++ b/VersionWrapper/pom.xml @@ -5,7 +5,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 4.0.0 diff --git a/VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionMatcher.class b/VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionMatcher.class deleted file mode 100644 index bad1883935b551520f9784271d9a0fbec4a04228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2138 zcmbVN+g95~6y0MCGDd{NxzUy;3T+Y~!7B7#(lmjFmexQTQ&R$IGL{EhSk`z+GMCqW zM!uqbF|1~-w$J^jwr3>a3-;;*UduDmoIU64v(M4Y-~asn2Y`Y_y*OZb{f zO=(1>zTIzYhqrbIF6;OP-!hE2;$X$~1MXTqtrC4M#Qi&lhnB3FWjm-eie`x)_|o0C z9bV(yEQT5%#2TBioMudP(^FD<8gdLqyJ9PjBg)))Y+1thpB!4E9#9Q5taYP8Vu8(- zu>}C#O+KMtYbr+96vJ5^ii`z%#DgC z4|vfLR2>bQUCcwF*JQ9P8*ZtC)E2|snWi*KQuu}|1H*6B>(Zk+JZf4rCsWvFV3QhN zoWBmMJg_S2!%8m65>L*>Ab$w`Yl1@77EJzh)(6`RhnN4ayBKMuP< z$4E^vU|6IN`<%|=ULt41;^gM9+xudjny$NTXxn5*_4-$cK%XGihct56&Ee{T7;E(x}X8d_|)k0l-nDHwFtO8fi1jB8dT7dwl|}iP0u5HE})j zZWA|$=95j_&YfWT4Q98FVP-yPV*VceoA{)O&*RmZ)-JMSzG_2G@VJR5e_`d<)i+q* zI(70x8*%>_`9HgiKgGt(b9$gKA%ghL;W@VPeLSy*^C1dkQJLO=Mq`R@zhSbB5KIHKG467hW@8d(!?{{se#S@Hk? diff --git a/VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionWrapper.class b/VersionWrapper/target/classes/com/github/dawsonvilamaa/beaconwaypoint/version/VersionWrapper.class deleted file mode 100644 index 3d4774e7c992d325e74068946b4cc7f066e5eef2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmZWlJ5Iwu5Sknjk*`L<0XP(5ZJHpO znbFhx=*`#n$0qdq`0SJZA~khN+L{|GHZ_1RaT70mR&8@;O=+7 zIjSml6F66Jcc7L~lgV+N9ys#~Zf(V8IXJA?Gzy;QiFG-qO;L!)RNJh;Wk2InoQ)UX z;YL%(E{=A=J7>S?9F?*k=(U3Td6W!^jTeoH)IL@)-AZoAH;xrV{|GOqAuICigmk - - Shared private waypoints will appear in the other player's private waypoint list - - Remove player access in the waypoint options menu - - Added more checks and default fallbacks for any missing plugin data or config items - - A beacon no longer needs a public waypoint associated with it to open the waypoint menu, though it still requires at least one public or private waypoint. This may change to have no restrictions in a future update so that any beacon can be used to teleport, even if it doesn't have any waypoint set - Fixes: - - Messages are now properly sent to waypoint owner(s) when a beacon with waypoints is broken - - Players are no able to take items from inventory menus if there is an error on a click event - -NOTE: -*This update also adds support for 1.21, but player heads will show as default skins. This will affect back and forward menu buttons as well as player heads in the waypoint sharing menu. I will try to find an alternative way to load player skulls for 1.21+. - -I recommend backing your plugin data in case upgrading to this version breaks something. I thoroughly tested upgrading versions and making sure it filled in missing language and config values wherever it could, but you should probably back up just in case. \ No newline at end of file + - Fixed error when reading player JSON files that were created in a previous version \ No newline at end of file diff --git a/core/dependency-reduced-pom.xml b/core/dependency-reduced-pom.xml index f757d75..5ca3b4f 100644 --- a/core/dependency-reduced-pom.xml +++ b/core/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 4.0.0 core diff --git a/core/pom.xml b/core/pom.xml index a52f0ad..4209de6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ BeaconWaypoints com.github.dawsonvilamaa - 1.7 + 1.7.1 core diff --git a/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/Main.java b/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/Main.java index 9ebfb5b..e9b672b 100644 --- a/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/Main.java +++ b/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/Main.java @@ -161,7 +161,7 @@ public void loadData() { Object uuid = jsonPlayer.get("uuid"); Object username = jsonPlayer.get("username"); if (waypointManager.getPlayer(UUID.fromString(uuid.toString())) == null) { - waypointManager.addPlayer(UUID.fromString(uuid.toString()), username.toString()); + waypointManager.addPlayer(UUID.fromString(uuid.toString()), username == null ? null : username.toString()); } for (JSONObject jsonWaypoint : (Iterable) jsonPlayer.get("waypoints")) { Waypoint waypoint = new Waypoint(jsonWaypoint); diff --git a/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/listeners/WorldListener.java b/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/listeners/WorldListener.java index aeb95ce..04b3227 100644 --- a/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/listeners/WorldListener.java +++ b/core/src/main/java/com/github/dawsonvilamaa/beaconwaypoint/listeners/WorldListener.java @@ -48,7 +48,7 @@ public void onPlayerJoin(PlayerJoinEvent e) { //add if not in map if (waypointPlayer == null) waypointManager.addPlayer(e.getPlayer().getUniqueId(), e.getPlayer().getName()); - else if (!waypointPlayer.getUsername().equals(e.getPlayer().getName())) + else if (waypointPlayer.getUsername() == null || !waypointPlayer.getUsername().equals(e.getPlayer().getName())) waypointPlayer.setUsername(e.getPlayer().getName()); //if player is op, check for updates diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index eea4b16..0150308 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ main: com.github.dawsonvilamaa.beaconwaypoint.Main name: BeaconWaypoints -version: 1.7 +version: 1.7.1 api-version: 1.14 author: Dawson Vilamaa description: Allows players to set fast travel waypoints at beacons diff --git a/pom.xml b/pom.xml index 00f30d4..1f82467 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.github.dawsonvilamaa BeaconWaypoints - 1.7 + 1.7.1 pom diff --git a/todo.txt b/todo.txt index b9762f4..b6ab4f7 100644 --- a/todo.txt +++ b/todo.txt @@ -1,18 +1,6 @@ -- update to 1.20.6 (done) -- make player skull button creation function (done) -- fix messages not being sent when a waypoint beacon is broken (done) -- share private waypoints with other players (done) - - don't allow sharing if it is already shared with that player (done) - - make sure player usernames are updated in player save files when their usernames are changed (done) - make function for confirmation menus (including option for center item) - make function for adding white stained glass panes in menus quickly - structure ConfigUpdater better -- prevent player from taking items on onclick errors (done) -- add failsafes if any field is missing from save files (done) -- check for shared private waypoint status on click so already open menus don't allow travel to waypoints that are no longer shared (done) -- test upgrading from old version (done) -- don't show waypoints in share GUI if they are already shared with the given player (done) -- allow player to open waypoint menu if they have a private waypoint set at that beacon but if there are no public waypoints (done) MAYBE: - add a GUI option for creating beacons @@ -20,4 +8,5 @@ MAYBE: - anvil GUI for setting name - add option to only allow a waypoint to go to other specific waypoint(s) - choose name color for waypoint in list -- add text on waypoint hover to tell player that they can right click for options (for beacons they own) \ No newline at end of file +- add text on waypoint hover to tell player that they can right click for options (for beacons they own) +- dynmap markers \ No newline at end of file