fix votingplugin + stop people using permission-rankup
This commit is contained in:
+1
-1
@@ -62,7 +62,7 @@ dependencies {
|
|||||||
compileOnly('com.github.mcMMO-Dev:mcMMO:601297') {
|
compileOnly('com.github.mcMMO-Dev:mcMMO:601297') {
|
||||||
exclude group: 'com.sk89q.worldguard'
|
exclude group: 'com.sk89q.worldguard'
|
||||||
}
|
}
|
||||||
compileOnly ('com.bencodez:votingplugin:6.13.1') {
|
compileOnly ('com.bencodez:votingplugin:6.14.1') {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
package sh.okx.rankup.requirements.requirement.votingplugin;
|
package sh.okx.rankup.requirements.requirement.votingplugin;
|
||||||
|
|
||||||
|
import com.bencodez.votingplugin.VotingPluginMain;
|
||||||
import com.bencodez.votingplugin.user.VotingPluginUser;
|
import com.bencodez.votingplugin.user.VotingPluginUser;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import sh.okx.rankup.RankupPlugin;
|
import sh.okx.rankup.RankupPlugin;
|
||||||
@@ -18,7 +19,7 @@ public class VotingPluginPointsDeductibleRequirement extends VotingPluginPointsR
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void apply(Player player, double multiplier) {
|
public void apply(Player player, double multiplier) {
|
||||||
VotingPluginUser user = VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player);
|
VotingPluginUser user = VotingPluginMain.getPlugin().getVotingPluginUserManager().getVotingPluginUser(player);
|
||||||
if(!user.removePoints(getValueInt())) {
|
if(!user.removePoints(getValueInt())) {
|
||||||
plugin.getLogger().warning("Unable to remove VotingPlugin points");
|
plugin.getLogger().warning("Unable to remove VotingPlugin points");
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
package sh.okx.rankup.requirements.requirement.votingplugin;
|
package sh.okx.rankup.requirements.requirement.votingplugin;
|
||||||
|
|
||||||
|
import com.bencodez.votingplugin.VotingPluginMain;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import sh.okx.rankup.RankupPlugin;
|
import sh.okx.rankup.RankupPlugin;
|
||||||
import sh.okx.rankup.requirements.ProgressiveRequirement;
|
import sh.okx.rankup.requirements.ProgressiveRequirement;
|
||||||
@@ -17,7 +18,7 @@ public class VotingPluginPointsRequirement extends ProgressiveRequirement {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getProgress(Player player) {
|
public double getProgress(Player player) {
|
||||||
return VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player).getPoints();
|
return VotingPluginMain.getPlugin().getVotingPluginUserManager().getVotingPluginUser(player).getPoints();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
-33
@@ -1,33 +0,0 @@
|
|||||||
package sh.okx.rankup.requirements.requirement.votingplugin;
|
|
||||||
|
|
||||||
import com.bencodez.votingplugin.VotingPluginMain;
|
|
||||||
import com.bencodez.votingplugin.user.UserManager;
|
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
|
|
||||||
public class VotingPluginUtil {
|
|
||||||
private static VotingPluginUtil instance;
|
|
||||||
|
|
||||||
private UserManager userManager;
|
|
||||||
|
|
||||||
private VotingPluginUtil() {
|
|
||||||
try {
|
|
||||||
userManager = (UserManager) UserManager.class.getMethod("getInstance").invoke(null);
|
|
||||||
} catch (NoSuchMethodException e) {
|
|
||||||
userManager = VotingPluginMain.getPlugin().getVotingPluginUserManager();
|
|
||||||
} catch (InvocationTargetException | IllegalAccessException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static VotingPluginUtil getInstance() {
|
|
||||||
if (instance == null) {
|
|
||||||
instance = new VotingPluginUtil();
|
|
||||||
}
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserManager getUserManager() {
|
|
||||||
return userManager;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
package sh.okx.rankup.requirements.requirement.votingplugin;
|
package sh.okx.rankup.requirements.requirement.votingplugin;
|
||||||
|
|
||||||
|
import com.bencodez.votingplugin.VotingPluginMain;
|
||||||
import com.bencodez.votingplugin.topvoter.TopVoter;
|
import com.bencodez.votingplugin.topvoter.TopVoter;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import sh.okx.rankup.RankupPlugin;
|
import sh.okx.rankup.RankupPlugin;
|
||||||
@@ -17,7 +18,7 @@ public class VotingPluginVotesRequirement extends ProgressiveRequirement {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getProgress(Player player) {
|
public double getProgress(Player player) {
|
||||||
return VotingPluginUtil.getInstance().getUserManager().getVotingPluginUser(player).getTotal(TopVoter.AllTime);
|
return VotingPluginMain.getPlugin().getVotingPluginUserManager().getVotingPluginUser(player).getTotal(TopVoter.AllTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -44,6 +44,9 @@ notify-update: true
|
|||||||
# if true, players will be checked for the permission rankup.rank.RANK, where RANK
|
# if true, players will be checked for the permission rankup.rank.RANK, where RANK
|
||||||
# is the rankup in rankups.yml. Nothing will automatically happen on rankup, so you must
|
# is the rankup in rankups.yml. Nothing will automatically happen on rankup, so you must
|
||||||
# use commands to change a player's group or permission.
|
# use commands to change a player's group or permission.
|
||||||
|
# THIS IS MORE DIFFICULT TO USE. DO NOT ENABLE THIS UNLESS YOU ARE HAPPY TO ACKNOWLEDGE THAT IT MAKES MORE WORK FOR YOU.
|
||||||
|
# By default, Rankup will automatically change groups when someone ranks up, using your permissions plugin.
|
||||||
|
# You only need to enable this if you really need the flexibility.
|
||||||
permission-rankup: false
|
permission-rankup: false
|
||||||
|
|
||||||
# if not empty, these are the contexts to use when modifying groups if LuckPerms is enabled
|
# if not empty, these are the contexts to use when modifying groups if LuckPerms is enabled
|
||||||
|
|||||||
Reference in New Issue
Block a user