From fc34a9e5dd813c61bdae7b4bb8bacba79e0cdcab Mon Sep 17 00:00:00 2001
From: Draycia <lonelyyordle@gmail.com>
Date: Sun, 26 Jan 2020 01:13:01 -0800
Subject: [PATCH 1/3] Fix directory capitalisation

Fixes issue with plugin not loading on Linux
---
 .../java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
index a65d440..ebfb251 100644
--- a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
+++ b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
@@ -15,7 +15,7 @@ public class SQLiteHandler {
 			String baseLoc = Bukkit.getWorldContainer().toURI().toString().substring(6);
 			baseLoc = baseLoc.substring(0,baseLoc.length()-2);
 
-			String url = "jdbc:sqlite:" + baseLoc + "plugins/TamableFoxes/foxes.db";
+			String url = "jdbc:sqlite:" + baseLoc + "plugins/Tamablefoxes/foxes.db";
 			connection = DriverManager.getConnection(url);
 
 			//Bukkit.getConsoleSender().sendMessage(TamableFoxes.getPrefix() + "Connection to SQLite has been established.");

From 88765de9d82dfd2a0ed0f92c77e711e8ca03194e Mon Sep 17 00:00:00 2001
From: Draycia <lonelyyordle@gmail.com>
Date: Sun, 26 Jan 2020 02:09:34 -0800
Subject: [PATCH 2/3] Properly fix startup on Linux

---
 .idea/workspace.xml                                |  5 +++--
 .../net/seanomik/tamablefoxes/TamableFoxes.java    |  3 ++-
 src/main/java/net/seanomik/tamablefoxes/Utils.java |  3 ---
 .../tamablefoxes/sqlite/SQLiteHandler.java         | 14 +++++++-------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7ba6544..aa0aed9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -54,6 +54,7 @@
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
     <property name="restartRequiresConfirmation" value="false" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
     <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
   </component>
   <component name="RecentsManager">
@@ -64,13 +65,13 @@
   </component>
   <component name="RunManager" selected="JAR Application.Spigot-1.15.1">
     <configuration name="Spigot-1.15.1" type="JarApplication">
-      <option name="JAR_PATH" value="$PROJECT_DIR$/../../_TEST_SERVER_1.15.1_/spigot-1.15.1.jar" />
+      <option name="JAR_PATH" value="$USER_HOME$/_TEST_SERVER_1.15.1_/spigot-1.15.1.jar" />
       <option name="WORKING_DIRECTORY" value="D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.1_" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <method v="2" />
     </configuration>
     <configuration default="true" type="JarApplication">
-      <option name="JAR_PATH" value="$PROJECT_DIR$/../../_TEST_SERVER_2_/spigot-1.15.1.jar" />
+      <option name="JAR_PATH" value="$USER_HOME$/_TEST_SERVER_2_/spigot-1.15.1.jar" />
       <option name="WORKING_DIRECTORY" value="D:\Code\java\spigotPlugins\_TEST_SERVER_2_" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <method v="2" />
diff --git a/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java b/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java
index 4c84a0f..4431972 100644
--- a/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java
+++ b/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java
@@ -42,12 +42,13 @@ public final class TamableFoxes extends JavaPlugin implements Listener {
     public List<EntityTamableFox> spawnedFoxes = new ArrayList<>();
 
     public SQLiteSetterGetter sqLiteSetterGetter = new SQLiteSetterGetter();
-    public SQLiteHandler sqLiteHandler = new SQLiteHandler();
+    public SQLiteHandler sqLiteHandler;
 
     private boolean versionSupported = true;
 
     @Override
     public void onLoad() {
+        sqLiteHandler = new SQLiteHandler(getDataFolder());
         plugin = this;
 
         LanguageConfig.getConfig().saveDefault();
diff --git a/src/main/java/net/seanomik/tamablefoxes/Utils.java b/src/main/java/net/seanomik/tamablefoxes/Utils.java
index d451527..ab95e56 100644
--- a/src/main/java/net/seanomik/tamablefoxes/Utils.java
+++ b/src/main/java/net/seanomik/tamablefoxes/Utils.java
@@ -5,9 +5,6 @@ import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class Utils {
diff --git a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
index ebfb251..5f8b35f 100644
--- a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
+++ b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteHandler.java
@@ -1,21 +1,21 @@
 package net.seanomik.tamablefoxes.sqlite;
 
-import net.seanomik.tamablefoxes.TamableFoxes;
-import org.bukkit.Bukkit;
-
+import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
 public class SQLiteHandler {
 	private Connection connection;
+	private File dataFolder;
+
+	public SQLiteHandler(File dataFolder) {
+		this.dataFolder = dataFolder;
+	}
 
 	public void connect() {
 		try {
-			String baseLoc = Bukkit.getWorldContainer().toURI().toString().substring(6);
-			baseLoc = baseLoc.substring(0,baseLoc.length()-2);
-
-			String url = "jdbc:sqlite:" + baseLoc + "plugins/Tamablefoxes/foxes.db";
+			String url = "jdbc:sqlite:/" + dataFolder.getAbsolutePath() + "/foxes.db";
 			connection = DriverManager.getConnection(url);
 
 			//Bukkit.getConsoleSender().sendMessage(TamableFoxes.getPrefix() + "Connection to SQLite has been established.");

From 0f772823d30b496dc9181ac88fb3a4847c89d084 Mon Sep 17 00:00:00 2001
From: Draycia <lonelyyordle@gmail.com>
Date: Sun, 26 Jan 2020 02:09:44 -0800
Subject: [PATCH 3/3] Cleanup imports

---
 .../pathfinding/FoxPathfinderGoalMeleeAttack.java     |  1 -
 .../pathfinding/FoxPathfinderGoalOwnerHurtTarget.java |  3 ---
 .../tamablefoxes/sqlite/SQLiteSetterGetter.java       | 11 -----------
 3 files changed, 15 deletions(-)

diff --git a/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalMeleeAttack.java b/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalMeleeAttack.java
index 968724c..490a7f4 100644
--- a/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalMeleeAttack.java
+++ b/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalMeleeAttack.java
@@ -1,6 +1,5 @@
 package net.seanomik.tamablefoxes.pathfinding;
 
-import net.minecraft.server.v1_15_R1.EntityFox;
 import net.minecraft.server.v1_15_R1.EntityLiving;
 import net.minecraft.server.v1_15_R1.PathfinderGoalMeleeAttack;
 import net.minecraft.server.v1_15_R1.SoundEffects;
diff --git a/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalOwnerHurtTarget.java b/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalOwnerHurtTarget.java
index 253710c..0ebbf61 100644
--- a/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalOwnerHurtTarget.java
+++ b/src/main/java/net/seanomik/tamablefoxes/pathfinding/FoxPathfinderGoalOwnerHurtTarget.java
@@ -1,14 +1,11 @@
 package net.seanomik.tamablefoxes.pathfinding;
 
-import net.minecraft.server.v1_15_R1.EntityTameableAnimal;
 import net.seanomik.tamablefoxes.EntityTamableFox;
 import net.minecraft.server.v1_15_R1.EntityLiving;
 import net.minecraft.server.v1_15_R1.PathfinderGoalTarget;
 import net.minecraft.server.v1_15_R1.PathfinderTargetCondition;
-import net.seanomik.tamablefoxes.Utils;
 import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
 
-import javax.rmi.CORBA.Util;
 import java.util.EnumSet;
 
 public class FoxPathfinderGoalOwnerHurtTarget extends PathfinderGoalTarget {
diff --git a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteSetterGetter.java b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteSetterGetter.java
index 653ff16..5ff2b21 100644
--- a/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteSetterGetter.java
+++ b/src/main/java/net/seanomik/tamablefoxes/sqlite/SQLiteSetterGetter.java
@@ -1,23 +1,12 @@
 package net.seanomik.tamablefoxes.sqlite;
 
-import net.minecraft.server.v1_15_R1.EntityFox;
 import net.minecraft.server.v1_15_R1.EntityLiving;
-import net.minecraft.server.v1_15_R1.EnumItemSlot;
 import net.seanomik.tamablefoxes.EntityTamableFox;
 import net.seanomik.tamablefoxes.TamableFoxes;
 import net.seanomik.tamablefoxes.Utils;
 import net.seanomik.tamablefoxes.io.LanguageConfig;
-import org.apache.commons.lang.ObjectUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
 
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;