From cce7f59f4a95f3526cb48a952893f5e1c216a967 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Wed, 8 Apr 2020 00:13:19 +0200
Subject: [PATCH] Fix issue with VanillaCommandListener on <1.15

---
 pom.xml                                                         | 2 +-
 .../buttondevteam/discordplugin/commands/ConnectCommand.java    | 2 +-
 .../discordplugin/playerfaker/VanillaCommandListener.java       | 2 +-
 .../discordplugin/playerfaker/VanillaCommandListener14.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f67686e..d21c469 100755
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@
         <dependency>
             <groupId>com.discord4j</groupId>
             <artifactId>discord4j-core</artifactId>
-            <version>3.0.12</version>
+            <version>3.0.13</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
         <dependency>
diff --git a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
index afa4cfb..f00c88a 100755
--- a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
@@ -14,7 +14,7 @@ import org.bukkit.entity.Player;
 
 @CommandClass(helpText = {
 	"Connect command", //
-	"This command lets you connect your account with a Minecraft account. This allows using the Minecraft chat and other things.", //
+	"This command lets you connect your account with a Minecraft account. This allows using the private Minecraft chat and other things.", //
 })
 public class ConnectCommand extends ICommand2DC {
 
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
index c9e6975..6a6dafd 100755
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener.java
@@ -37,7 +37,7 @@ public class VanillaCommandListener<T extends DiscordSenderBase & IMCPlayer<T>>
 	public VanillaCommandListener(T player, Player bukkitplayer) {
 		this.player = player;
 		this.bukkitplayer = bukkitplayer;
-		if (!(bukkitplayer instanceof CraftPlayer))
+		if (bukkitplayer != null && !(bukkitplayer instanceof CraftPlayer))
 			throw new ClassCastException("bukkitplayer must be a Bukkit player!");
 	}
 
diff --git a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java
index fbaf958..b40364d 100644
--- a/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java
+++ b/src/main/java/buttondevteam/discordplugin/playerfaker/VanillaCommandListener14.java
@@ -39,7 +39,7 @@ public class VanillaCommandListener14<T extends DiscordSenderBase & IMCPlayer<T>
 	public VanillaCommandListener14(T player, Player bukkitplayer) {
 		this.player = player;
 		this.bukkitplayer = bukkitplayer;
-		if (!(bukkitplayer instanceof CraftPlayer))
+		if (bukkitplayer != null && !(bukkitplayer instanceof CraftPlayer))
 			throw new ClassCastException("bukkitplayer must be a Bukkit player!");
 	}