From eb8663f5b8ea07fad2c2adb8abf970ae19851fba Mon Sep 17 00:00:00 2001
From: xPlumpOrange <31327360+xPlumpOrange@users.noreply.github.com>
Date: Mon, 10 May 2021 21:01:26 -0400
Subject: [PATCH] Fixed Bukkit Config Loading and ProtocolLib Implementation

Changed resource streaming for the Bukkit implementation of the config to Bukkit's resource streamer. Also fixed an issue with the ProtocolLib implementation where it throws an error instead of warning and disabling when ProtocolLib is not installed.
---
 .../java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java | 2 +-
 .../net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java   | 8 +++++++-
 .../tcpshield/bukkit/protocollib/BukkitProtocolLib.java   | 5 -----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java b/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java
index d20a6e8..4a7261f 100644
--- a/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java
+++ b/src/main/java/net/tcpshield/tcpshield/bukkit/BukkitConfig.java
@@ -54,7 +54,7 @@ public class BukkitConfig extends ConfigProvider {
 				// Just ignore since it either does not exist, or we can overwrite
 			}
 
-			try (InputStream in = BukkitConfig.class.getResourceAsStream("config.yml")) {
+			try (InputStream in = plugin.getResource("config.yml")) { // Have to use Bukkit's resource streaming or the resource wont be found
 				Files.copy(in, configFile.toPath());
 			}
 		} catch (Exception e) {
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java b/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java
index 218e19b..e1c6ef3 100644
--- a/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java
+++ b/src/main/java/net/tcpshield/tcpshield/bukkit/TCPShieldBukkit.java
@@ -31,8 +31,14 @@ public class TCPShieldBukkit extends JavaPlugin implements TCPShieldPlugin {
 
 			if (BukkitImplProvider.hasPaperEvent())
 				bukkitImpl = new BukkitPaper(this);
-			else
+			else {
+				if (getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
+					getLogger().severe("TCPShield not loading because ProtocolLib is not installed. Either use Paper to enable native compatibility or install ProtocolLib.");
+					return;
+				}
+
 				bukkitImpl = new BukkitProtocolLib(this);
+			}
 
 			bukkitImpl.load();
 		} catch (Exception e) {
diff --git a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java
index 7478422..b322d64 100644
--- a/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java
+++ b/src/main/java/net/tcpshield/tcpshield/bukkit/protocollib/BukkitProtocolLib.java
@@ -16,11 +16,6 @@ public class BukkitProtocolLib extends BukkitImplProvider {
 
 	@Override
 	public void load() {
-		if (getPlugin().getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
-			getPlugin().getLogger().severe("TCPShield not loading because ProtocolLib is not installed. Either use Paper to enable native compatibility or install ProtocolLib.");
-			return;
-		}
-
 		ProtocolLibHandshakeHandler packetHandler = new ProtocolLibHandshakeHandler(this);
 		com.comphenix.protocol.ProtocolLibrary.getProtocolManager().addPacketListener(packetHandler);
 	}