From 89ab3ff194b406de07939ce5adb0399935685a37 Mon Sep 17 00:00:00 2001 From: cnaude Date: Mon, 14 Mar 2016 18:21:25 -0700 Subject: [PATCH] Update SuperVanish (and PremiiumVanish) dependency to 5.5.0. --- dependency-reduced-pom.xml | 8 ++++---- pom.xml | 8 ++++---- .../java/com/cnaude/purpleirc/Hooks/SuperVanishHook.java | 4 ++-- src/main/java/com/cnaude/purpleirc/PurpleIRC.java | 7 +++++++ src/main/resources/plugin.yml | 1 + 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 3ae86d5..e168bde 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -26,7 +26,7 @@ maven-compiler-plugin - 3.3 + 3.5.1 1.7 1.7 @@ -34,7 +34,7 @@ maven-shade-plugin - 2.4.2 + 2.4.3 package @@ -156,7 +156,7 @@ com.google.guava guava - 18.0 + 19.0 compile @@ -344,7 +344,7 @@ com.cnaude.supervanish SuperVanish - 5.0.1 + 5.5.0 compile diff --git a/pom.xml b/pom.xml index 03c28b2..8630f02 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ com.google.guava guava - 18.0 + 19.0 @@ -343,7 +343,7 @@ com.cnaude.supervanish SuperVanish - 5.0.1 + 5.5.0 @@ -398,7 +398,7 @@ maven-compiler-plugin - 3.3 + 3.5.1 1.7 1.7 @@ -408,7 +408,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.2 + 2.4.3 package diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/SuperVanishHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/SuperVanishHook.java index c22e532..4b50a6e 100644 --- a/src/main/java/com/cnaude/purpleirc/Hooks/SuperVanishHook.java +++ b/src/main/java/com/cnaude/purpleirc/Hooks/SuperVanishHook.java @@ -18,7 +18,7 @@ package com.cnaude.purpleirc.Hooks; import com.cnaude.purpleirc.PurpleIRC; import java.util.List; -import me.MyzelYam.SuperVanish.api.SVAPI; +import de.myzelyam.api.vanish.VanishAPI; import org.bukkit.entity.Player; /** @@ -43,7 +43,7 @@ public class SuperVanishHook { * @return */ public boolean isVanished(Player player) { - List invisiblePlayers = SVAPI.getInvisiblePlayers(); + List invisiblePlayers = VanishAPI.getInvisiblePlayers(); for (String uuid : invisiblePlayers) { if (uuid.equalsIgnoreCase(player.getUniqueId().toString())) { plugin.logDebug("Player " + player.getName() + " is vanished."); diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java index 929fefc..63ce4f8 100644 --- a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java +++ b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java @@ -220,6 +220,7 @@ public class PurpleIRC extends JavaPlugin { final String PL_SIMPLETICKET = "SimpleTicketManager"; final String PL_NTHE_END_AGAIN = "NTheEndAgain"; final String PL_SUPERVANISH = "SuperVanish"; + final String PL_PREMIUMVANISH = "PremiumVanish"; final String PL_VANISHNOPACKET = "VanishNoPacket"; final String PL_OREBROADCAST = "OreBroadcast"; final String PL_DYNMAP = "dynmap"; @@ -1698,6 +1699,12 @@ public class PurpleIRC extends JavaPlugin { } else { hookList.add(hookFormat(PL_SUPERVANISH, false)); } + if (isPluginEnabled(PL_PREMIUMVANISH)) { + hookList.add(hookFormat(PL_PREMIUMVANISH, true)); + superVanishHook = new SuperVanishHook(this); + } else { + hookList.add(hookFormat(PL_SUPERVANISH, false)); + } if (isPluginEnabled(PL_REPORTRTS)) { hookList.add(hookFormat(PL_REPORTRTS, true)); getServer().getPluginManager().registerEvents(new ReportRTSListener(this), this); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ff87e5f..8f928f0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -21,6 +21,7 @@ softdepend: - RedditStream - AdminPrivateChat - SuperVanish +- PremiumVanish - VanishNoPacket commands: irc: