From 330e92ef7225272af92b7b92e89989b80b9294c5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 25 Dec 2018 17:00:04 -0500 Subject: [PATCH] Remove GPS so Jenkins can compile. Bump version number --- pom.xml | 9 +-------- src/main/java/me/blackvein/quests/Quest.java | 4 ++-- src/main/java/me/blackvein/quests/Quests.java | 7 +++---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 314e88114..859481cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ me.blackvein.quests quests - 3.5.6 + 3.5.7 quests https://github.com/FlyingPikachu/Quests/ jar @@ -186,13 +186,6 @@ system ${project.basedir}/lib/CitizensBooks-2.4.7.jar - - com.live.bemmamin - GPS - 2.2.2 - system - ${project.basedir}/lib/GPS.jar - diff --git a/src/main/java/me/blackvein/quests/Quest.java b/src/main/java/me/blackvein/quests/Quest.java index cc68ede65..892615efe 100644 --- a/src/main/java/me/blackvein/quests/Quest.java +++ b/src/main/java/me/blackvein/quests/Quest.java @@ -616,11 +616,11 @@ public class Quest { q.saveData(); player.updateInventory(); q.updateJournal(); - if (Quests.gpsapi != null) { + /*if (Quests.gpsapi != null) { if (Quests.gpsapi.gpsIsActive(player)) { Quests.gpsapi.stopGPS(player); } - } + }*/ q.findCompassTarget(); } diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index de8ab0d18..e44a5f579 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -88,7 +88,6 @@ import com.gmail.nossr50.util.player.UserManager; import com.herocraftonline.heroes.Heroes; import com.herocraftonline.heroes.characters.Hero; import com.herocraftonline.heroes.characters.classes.HeroClass; -import com.live.bemmamin.gps.api.GPSAPI; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -120,7 +119,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener public static Permission permission = null; public static WorldGuardPlugin worldGuard = null; public static mcMMO mcmmo = null; - public static GPSAPI gpsapi = null; + //public static GPSAPI gpsapi = null; public static Heroes heroes = null; public static PhatLoots phatLoots = null; public static PlaceholderAPIPlugin placeholder = null; @@ -430,9 +429,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener if (isPluginReady("mcMMO")) { mcmmo = (mcMMO) getServer().getPluginManager().getPlugin("mcMMO"); } - if (isPluginReady("GPS")) { + /*if (isPluginReady("GPS")) { gpsapi = new GPSAPI(this); - } + }*/ if (isPluginReady("Heroes")) { heroes = (Heroes) getServer().getPluginManager().getPlugin("Heroes"); }