From c0996299b481f329bce5906a89247466ccc8c720 Mon Sep 17 00:00:00 2001
From: SupremeMortal <owennhoward@gmail.com>
Date: Sat, 27 Aug 2016 14:03:41 +0100
Subject: [PATCH 1/6] Remove non-existent Repo

"nexus.theyeticave.net" does not exist anymore.
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f85ae30a5..9d5d6312d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,10 +69,6 @@
       <id>sk80q</id>
       <url>http://maven.sk89q.com/artifactory/repo/</url>
     </repository>
-    <repository>
-      <id>vault-repo</id>
-      <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
-    </repository>
     <repository>
       <id>empcraft-repo</id>
       <url>http://empcraft.com/maven2</url>

From 1266eed86a730436ed6889776974c9b3533a749b Mon Sep 17 00:00:00 2001
From: SupremeMortal <owennhoward@gmail.com>
Date: Sat, 27 Aug 2016 14:08:35 +0100
Subject: [PATCH 2/6] Add Replacement Repo For Vault

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9d5d6312d..d338a4f85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,10 @@
       <id>sk80q</id>
       <url>http://maven.sk89q.com/artifactory/repo/</url>
     </repository>
+    <repository>
+      <id>vault</id>
+      <url>http://maven.elmakers.com/repository/net/milkbowl/vault/Vault/</url>
+    </repository>
     <repository>
       <id>empcraft-repo</id>
       <url>http://empcraft.com/maven2</url>

From 50770a78d728163a956b9a15e309905a51c6f860 Mon Sep 17 00:00:00 2001
From: SupremeMortal <owennhoward@gmail.com>
Date: Sat, 27 Aug 2016 14:09:03 +0100
Subject: [PATCH 3/6] Fixed mistake

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d338a4f85..9af13f228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     </repository>
     <repository>
       <id>vault</id>
-      <url>http://maven.elmakers.com/repository/net/milkbowl/vault/Vault/</url>
+      <url>http://maven.elmakers.com/repository/</url>
     </repository>
     <repository>
       <id>empcraft-repo</id>

From 7fc3fb097e20d1f2f4c8317acc2f4e14ebe3ae19 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Sun, 28 Aug 2016 01:12:51 -0700
Subject: [PATCH 4/6] Fix Spigot artifact in POM

Use the correct groupId, artifactId and version of Spigot dependency
installed by BuildTools
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 789f1edb6..c1cb605b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,9 +80,9 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>Spigot</artifactId>
-      <version>1.10</version>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.10.2-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.sk89q</groupId>

From 20250bc9897dbfeeba129af9fd3f00dd218a62d4 Mon Sep 17 00:00:00 2001
From: manuelgu <code@manuelgu.eu>
Date: Sun, 28 Aug 2016 20:14:58 +0200
Subject: [PATCH 5/6] Might resolve #1331

Wasn't able to reproduce the issue
---
 .../com/plotsquared/bukkit/listeners/EntitySpawnListener.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 4dedca86d..e693716fe 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -22,6 +22,9 @@ public class EntitySpawnListener implements Listener {
             return;
         }
         Plot plot = area.getOwnedPlotAbs(location);
+        if (plot == null) {
+            return;
+        }
         if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
             event.setCancelled(true);
         }

From 2fcb59f8cf9bc5603a70404c081f2f19a3a26157 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Sun, 28 Aug 2016 18:26:11 -0700
Subject: [PATCH 6/6] Switch Vault repository to the real one

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9846d0c4..ea5039fe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     </repository>
     <repository>
       <id>vault</id>
-      <url>http://maven.elmakers.com/repository/</url>
+      <url>http://nexus.hc.to/content/repositories/pub_releases/</url>
     </repository>
     <repository>
       <id>empcraft-repo</id>