Fix existing session NPE

A5H73Y · Jan 7, 2023 · fe61f66 · fe61f66
1 parent 33e4c2d
commit fe61f66
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@
 		<dependency>
 			<groupId>com.github.cryptomorin</groupId>
 			<artifactId>XSeries</artifactId>
-			<version>9.1.0</version>
+			<version>9.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- Version Compare -->
@@ -163,7 +163,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10</version>
+			<version>2.10.1</version>
 		</dependency>
 	</dependencies>
 

diff --git a/src/main/java/io/github/a5h73y/parkour/listener/PlayerListener.java b/src/main/java/io/github/a5h73y/parkour/listener/PlayerListener.java
@@ -215,7 +215,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
         ParkourSession session = parkour.getParkourSessionManager().loadParkourSession(player,
                 playerConfig.getExistingSessionCourseName());
-        playerConfig.setExistingSessionCourseName(null);
+        playerConfig.removeExistingSessionCourseName();
 
         if (!parkour.getParkourSessionManager().isPlaying(player)) {
             return;

diff --git a/src/main/java/io/github/a5h73y/parkour/type/player/session/ParkourSessionManager.java b/src/main/java/io/github/a5h73y/parkour/type/player/session/ParkourSessionManager.java
@@ -214,7 +214,7 @@ public void saveParkourSession(Player player, boolean removePlaying) {
 	public ParkourSession loadParkourSession(Player player, String courseName) {
 		ParkourSession result = null;
 
-		if (ParkourSessionConfig.hasParkourSessionConfig(player, courseName)) {
+		if (courseName != null && ParkourSessionConfig.hasParkourSessionConfig(player, courseName)) {
 			ParkourSessionConfig config = ParkourSessionConfig.getConfig(player, courseName);
 
 			// course is populated by deserializing