Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-03 06:57:58 +01:00
Code Issues Projects Releases Wiki Activity

Remove GPS so Jenkins can compile. Bump version number

Browse Source
This commit is contained in:
BuildTools 2018-12-25 17:00:04 -05:00
parent 8625b8a5a2
commit 330e92ef72
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId> <groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId> <artifactId>quests</artifactId>
<version>3.5.6</version> <version>3.5.7</version>
<name>quests</name> <name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url> <url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging> <packaging>jar</packaging>
@ -186,13 +186,6 @@
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/lib/CitizensBooks-2.4.7.jar</systemPath> <systemPath>${project.basedir}/lib/CitizensBooks-2.4.7.jar</systemPath>
</dependency> </dependency>
<dependency>
<groupId>com.live.bemmamin</groupId>
<artifactId>GPS</artifactId>
<version>2.2.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/GPS.jar</systemPath>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
src/main/java/me/blackvein/quests/Quest.java
View File

@ -616,11 +616,11 @@ public class Quest {
q.saveData(); q.saveData();
player.updateInventory(); player.updateInventory();
q.updateJournal(); q.updateJournal();
if (Quests.gpsapi != null) { /*if (Quests.gpsapi != null) {
if (Quests.gpsapi.gpsIsActive(player)) { if (Quests.gpsapi.gpsIsActive(player)) {
Quests.gpsapi.stopGPS(player); Quests.gpsapi.stopGPS(player);
} }
} }*/
q.findCompassTarget(); q.findCompassTarget();
} }

7
src/main/java/me/blackvein/quests/Quests.java
View File

@ -88,7 +88,6 @@ import com.gmail.nossr50.util.player.UserManager;
import com.herocraftonline.heroes.Heroes; import com.herocraftonline.heroes.Heroes;
import com.herocraftonline.heroes.characters.Hero; import com.herocraftonline.heroes.characters.Hero;
import com.herocraftonline.heroes.characters.classes.HeroClass; import com.herocraftonline.heroes.characters.classes.HeroClass;
import com.live.bemmamin.gps.api.GPSAPI;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; 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 Permission permission = null;
public static WorldGuardPlugin worldGuard = null; public static WorldGuardPlugin worldGuard = null;
public static mcMMO mcmmo = null; public static mcMMO mcmmo = null;
public static GPSAPI gpsapi = null; //public static GPSAPI gpsapi = null;
public static Heroes heroes = null; public static Heroes heroes = null;
public static PhatLoots phatLoots = null; public static PhatLoots phatLoots = null;
public static PlaceholderAPIPlugin placeholder = null; public static PlaceholderAPIPlugin placeholder = null;
@ -430,9 +429,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (isPluginReady("mcMMO")) { if (isPluginReady("mcMMO")) {
mcmmo = (mcMMO) getServer().getPluginManager().getPlugin("mcMMO"); mcmmo = (mcMMO) getServer().getPluginManager().getPlugin("mcMMO");
} }
if (isPluginReady("GPS")) { /*if (isPluginReady("GPS")) {
gpsapi = new GPSAPI(this); gpsapi = new GPSAPI(this);
} }*/
if (isPluginReady("Heroes")) { if (isPluginReady("Heroes")) {
heroes = (Heroes) getServer().getPluginManager().getPlugin("Heroes"); heroes = (Heroes) getServer().getPluginManager().getPlugin("Heroes");
} }