Update version number to 6.3

VotingPlugin/Resources/BungeeSettings.yml

@@ -35,6 +35,10 @@ BungeeBroadcastAlways: false
 # Requires server name below to be correct
 PerServerRewards: false
 
+# If true, plugin will trigger VotifierEvent
+# Should allow some compability with other plugins
+TriggerVotifierEvent: false
+
 # What server this is in bungee (must match)
 # Also can be applied to rewards
 Server: PleaseSet

VotingPlugin/Resources/Config.yml

@@ -137,6 +137,13 @@ Format:
   # Broadcast only when player is online
   BroadcastWhenOnline: false
   
+  # Broadcast every x number of minutes with number of players that voted
+  AlternateBroadcast:
+    Enabled: false
+    Broadcast: '&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote'
+    # Delay in minutes
+    Delay: 30
+  
   Commands:
     # Format for /vote
     # %num% = the number of the site, for a numbered list
@@ -247,7 +254,7 @@ Format:
         
       Today:
         Title:
-        - '&cToday's Votes %page%/%maxpage%'
+        - "&cToday's Votes %page%/%maxpage%"
         - '&cPlayerName : VoteSite : Time'
         Line: '&6%player% : %VoteSite% : %Time%'
         
@@ -384,6 +391,9 @@ TreatVanishAsOffline: false
 # If true, cooldown check is disabled
 DisableCoolDownCheck: false
 
+# If true, disable PlayerInteractEvent (for clicking signs and skulls)
+DisableInteractEvent: false
+
 # Delays login event, delays vote reminding and more
 # In ticks
 DelayLoginEvent: 0
@@ -576,6 +586,10 @@ UseVaultPermissions: false
 # - PERMISSION
 DisabledCommands: []
 
+# Enable Geyser prefix support
+GeyserPrefixSupport: false
+GeyserPrefix: '*'
+
 # Enable to true for extra player checks
 ExtraBackgroundUpdate: false
 

VotingPlugin/Resources/GUI.yml

@@ -147,7 +147,7 @@ CHEST:
       Amount: 1
   VoteTop:
     Name: 'VoteTop %topvoter%'
-    BackButton: false
+    BackButton: true
     # Item of top voter (change material below)
     Item:
       Name: '&3&l%position%: &3%player%'
@@ -268,6 +268,8 @@ CHEST:
     Name: '&8Back to VoteGUI'
     # If true, clicking back button will open VoteURL
     OpenVoteURL: false
+    # If true, backbutton will be the last slot of the GUI
+    EndOfGUI: false
 
   VoteShopBackButton: true
   VoteShopEnabled: true

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>6.2</version>
+	<version>6.3</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -228,14 +228,7 @@
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>always</updatePolicy>
-			</snapshots>
-		</repository>
+
 		<repository>
 			<id>maven-central</id>
 			<url>https://oss.sonatype.org/content/groups/public</url>
@@ -318,6 +311,16 @@
 					<version>master-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
+			<repositories>
+				<repository>
+					<id>jitpack.io</id>
+					<url>https://jitpack.io</url>
+					<snapshots>
+						<enabled>true</enabled>
+						<updatePolicy>always</updatePolicy>
+					</snapshots>
+				</repository>
+			</repositories>
 		</profile>
 		<profile>
 			<id>prod2</id>

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java

@@ -54,6 +54,7 @@ import com.bencodez.advancedcore.api.user.UUID;
 import com.bencodez.advancedcore.api.user.UserStorage;
 import com.bencodez.advancedcore.logger.Logger;
 import com.bencodez.advancedcore.nms.NMSManager;
+import com.bencodez.votingplugin.broadcast.BroadcastHandler;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
 import com.bencodez.votingplugin.commands.executers.CommandVote;
@@ -656,6 +657,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 			if (getOptions().isPerServerRewards()) {
 				getMysql().alterColumnType("OfflineRewards" + getOptions().getServer(), "MEDIUMTEXT");
 			}
@@ -716,6 +718,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			});
 		}
 
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			broadcastHandler = new BroadcastHandler(plugin, plugin.getConfigFile().getFormatAlternateBroadcastDelay());
+			plugin.debug("Using alternate broadcast method");
+		}
+
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (getProfile().equals("dev")) {
 			plugin.getLogger().warning("Using dev build, this is not a stable build, use at your own risk");
@@ -759,6 +766,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	}
 
+	@Getter
+	private BroadcastHandler broadcastHandler;
+
 	public void loadDirectlyDefined() {
 		RewardHandler.getInstance().getDirectlyDefinedRewards().clear();
 		// AllSites reward
@@ -773,6 +783,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		// FirstVote
@@ -787,6 +807,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("VoteReminding.Rewards") {
@@ -800,6 +830,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getConfigFile().getData();
 			}
+
+			@Override
+			public void save() {
+				getConfigFile().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getConfigFile().saveData();
+			}
 		});
 
 		// vote cooldown ended
@@ -814,6 +854,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		// any site rewards
@@ -828,6 +878,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		addDirectlyDefinedRewards(new DirectlyDefinedReward("EverySiteReward") {
@@ -841,6 +901,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getConfigVoteSites().getData();
 			}
+
+			@Override
+			public void save() {
+				getConfigVoteSites().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getConfigVoteSites().createSection(key);
+			}
 		});
 
 		// login rewards
@@ -855,6 +925,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		// logout rewards
@@ -869,6 +949,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		// VoteParty
@@ -883,6 +973,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			public ConfigurationSection getFileData() {
 				return getSpecialRewardsConfig().getData();
 			}
+
+			@Override
+			public void save() {
+				getSpecialRewardsConfig().saveData();
+			}
+
+			@Override
+			public void createSection(String key) {
+				getSpecialRewardsConfig().createSection(key);
+			}
 		});
 
 		// Cumulative rewards
@@ -898,6 +998,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				public ConfigurationSection getFileData() {
 					return getSpecialRewardsConfig().getData();
 				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
 			});
 		}
 
@@ -914,6 +1024,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				public ConfigurationSection getFileData() {
 					return getSpecialRewardsConfig().getData();
 				}
+
+				@Override
+				public void save() {
+					getSpecialRewardsConfig().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getSpecialRewardsConfig().createSection(key);
+				}
 			});
 		}
 
@@ -930,6 +1050,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				public ConfigurationSection getFileData() {
 					return getConfigVoteSites().getData();
 				}
+
+				@Override
+				public void save() {
+					getConfigVoteSites().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getConfigVoteSites().createSection(key);
+				}
 			});
 		}
 
@@ -948,6 +1078,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					public ConfigurationSection getFileData() {
 						return getSpecialRewardsConfig().getData();
 					}
+
+					@Override
+					public void save() {
+						getSpecialRewardsConfig().saveData();
+					}
+
+					@Override
+					public void createSection(String key) {
+						getSpecialRewardsConfig().createSection(key);
+					}
 				});
 			}
 		}
@@ -965,6 +1105,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 						public ConfigurationSection getFileData() {
 							return getSpecialRewardsConfig().getData();
 						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
 					});
 		}
 
@@ -981,6 +1131,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 						public ConfigurationSection getFileData() {
 							return getSpecialRewardsConfig().getData();
 						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
 					});
 		}
 
@@ -997,6 +1157,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 						public ConfigurationSection getFileData() {
 							return getSpecialRewardsConfig().getData();
 						}
+
+						@Override
+						public void save() {
+							getSpecialRewardsConfig().saveData();
+						}
+
+						@Override
+						public void createSection(String key) {
+							getSpecialRewardsConfig().createSection(key);
+						}
 					});
 		}
 
@@ -1012,6 +1182,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 				public ConfigurationSection getFileData() {
 					return getGui().getData();
 				}
+
+				@Override
+				public void save() {
+					getGui().saveData();
+				}
+
+				@Override
+				public void createSection(String key) {
+					getGui().createSection(key);
+				}
 			});
 		}
 
@@ -1118,7 +1298,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new SignChange(this), this);
 		pm.registerEvents(new BlockBreak(this), this);
-		pm.registerEvents(new PlayerInteract(this), this);
+		if (!plugin.getConfigFile().isDisableInteractEvent()) {
+			pm.registerEvents(new PlayerInteract(this), this);
+		}
+
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		/*
 		 * if (!NMSManager.getInstance().isVersion("1.12")) { pm.registerEvents(new
@@ -1158,6 +1341,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings.reloadData();
 		checkYMLError();
 
+		if (broadcastHandler != null) {
+			broadcastHandler.schelude(getConfigFile().getFormatAlternateBroadcastDelay());
+		}
+
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
 		loadDirectlyDefined();

VotingPlugin/src/com/bencodez/votingplugin/broadcast/BroadcastHandler.java

@@ -0,0 +1,67 @@
+package com.bencodez.votingplugin.broadcast;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.messages.StringParser;
+import com.bencodez.advancedcore.api.misc.MiscUtils;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.user.UserManager;
+
+public class BroadcastHandler {
+	ConcurrentLinkedQueue<String> votedPlayers = new ConcurrentLinkedQueue<String>();
+	private Timer timer;
+	private VotingPluginMain plugin;
+
+	public BroadcastHandler(VotingPluginMain plugin, int delay) {
+		this.plugin = plugin;
+		schelude(delay);
+	}
+
+	public void schelude(int delay) {
+		if (timer != null) {
+			timer.cancel();
+		} else {
+			timer = new Timer();
+		}
+		timer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				check();
+			}
+		}, 1000 * 60, 1000 * 60 * delay);
+	}
+
+	public void onVote(String player) {
+		votedPlayers.add(player);
+	}
+
+	public void check() {
+		int size = votedPlayers.size();
+		if (size > 0) {
+			for (int i = 0; i < size; i++) {
+				votedPlayers.poll();
+			}
+			String bc = StringParser.getInstance()
+					.colorize(plugin.getConfigFile().getFormatAlternateBroadcastBroadcast());
+			HashMap<String, String> placeholders = new HashMap<String, String>();
+			placeholders.put("numberofplayers", "" + size);
+			bc = StringParser.getInstance().replacePlaceHolder(bc, placeholders);
+			ArrayList<Player> players = new ArrayList<Player>();
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				if (!UserManager.getInstance().getVotingPluginUser(p).getDisableBroadcast()) {
+					players.add(p);
+				}
+			}
+
+			MiscUtils.getInstance().broadcast(bc, players);
+		}
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java

@@ -279,6 +279,7 @@ public class VotingPluginBungee extends Plugin {
 			getMysql().alterColumnType("HighestWeeklyTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("LastMonthTotal", "INT DEFAULT '0'");
 			getMysql().alterColumnType("OfflineRewards", "MEDIUMTEXT");
+			getMysql().alterColumnType("DayVoteStreakLastUpdate", "MEDIUMTEXT");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -439,7 +440,15 @@ public class VotingPluginBungee extends Plugin {
 				String server = in.readUTF();
 				getLogger().info("Status okay for " + server);
 				return;
+			} else if (subchannel.equalsIgnoreCase("login")) {
+				String player = in.readUTF();
+				ProxiedPlayer p = getProxy().getPlayer(player);
+				String server = p.getServer().getInfo().getName();
+				checkCachedVotes(server);
+				checkOnlineVotes(p, p.getUniqueId().toString(), server);
+				return;
 			} else {
+
 				// reforward message
 				out.writeUTF(subchannel);
 				out.writeInt(size);

VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -125,7 +125,13 @@ public class CommandLoader {
 					new VoteURL(plugin, event.getWhoClicked(), user, true).open();
 				}
 			}
+			
 		};
+		
+		// set item to end of the GUI
+		if (sec != null && sec.getBoolean("EndOfGUI")) {
+			b.setSlot(-2);
+		}
 
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
 			b.dontClose();
@@ -1683,7 +1689,7 @@ public class CommandLoader {
 										if (user.removePoints(points)) {
 
 											RewardHandler.getInstance().giveReward(user,
-													plugin.getConfigFile().getData(),
+													plugin.getGui().getData(),
 													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/AdminVoteHelp.java

@@ -67,9 +67,7 @@ public class AdminVoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getAdminVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
-				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
-			} else {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/adminvote"), cmdHandle.getHelpLine("/adminvote"));
 			}
 		}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java

@@ -38,12 +38,10 @@ public class VoteHelp extends GUIHandler {
 		boolean requirePerms = plugin.getConfigFile().getFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
-			if (requirePerms && sender.hasPermission(cmdHandle.getPerm())) {
+			if (!requirePerms || cmdHandle.hasPerm(sender)) {
 				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
 						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
-			} else {
-				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote"));
-			}
+			} 
 		}
 		ArrayList<String> unsortedList = new ArrayList<String>();
 		unsortedList.addAll(unsorted.keySet());

VotingPlugin/src/com/bencodez/votingplugin/config/BungeeSettings.java

@@ -29,6 +29,10 @@ public class BungeeSettings extends YMLFile {
 	@Getter
 	private boolean votifierBypass = false;
 
+	@ConfigDataBoolean(path = "TriggerVotifierEvent")
+	@Getter
+	private boolean triggerVotifierEvent = false;
+
 	@ConfigDataString(path = "BungeeMethod")
 	@Getter
 	private String bungeeMethod = "PLUGINMESSAGING";

VotingPlugin/src/com/bencodez/votingplugin/config/Config.java

@@ -133,10 +133,26 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean formatCommandsVoteForceLinks = true;
 
+	@ConfigDataBoolean(path = "DisableInteractEvent")
+	@Getter
+	private boolean disableInteractEvent = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.LastVoted")
 	@Getter
 	private String formatCommandsVoteLastLastVoted = "%times% ago";
 
+	@ConfigDataString(path = "Format.AlternateBroadcast.Broadcast")
+	@Getter
+	private String formatAlternateBroadcastBroadcast = "&6[&4Broadcast&6] &2%numberofplayers% voted in the last half hour! /vote";
+
+	@ConfigDataInt(path = "Format.AlternateBroadcast.Delay")
+	@Getter
+	private int formatAlternateBroadcastDelay = 30;
+
+	@ConfigDataBoolean(path = "Format.AlternateBroadcast.Enabled")
+	@Getter
+	private boolean formatAlternateBroadcastEnabled = false;
+
 	@ConfigDataString(path = "Format.Commands.Vote.Last.Line", defaultValue = "&3%SiteName%: &6%timeSince% ago")
 	@Getter
 	private String formatCommandsVoteLastLine;

VotingPlugin/src/com/bencodez/votingplugin/config/ConfigVoteSites.java

@@ -148,6 +148,10 @@ public class ConfigVoteSites extends YMLFile {
 	public boolean getVoteSiteHidden(String siteName) {
 		return getData(siteName).getBoolean("Hidden");
 	}
+	
+	public boolean getVoteSiteIgnoreCanVote(String siteName) {
+		return getData(siteName).getBoolean("IgnoreCanVote");
+	}
 
 	/**
 	 * Gets the vote site file.

VotingPlugin/src/com/bencodez/votingplugin/config/GUI.java

@@ -357,7 +357,7 @@ public class GUI extends YMLFile {
 	}
 
 	public boolean getChestVoteTopBackButton() {
-		return getData().getBoolean("CHEST.VoteToday.BackButton");
+		return getData().getBoolean("CHEST.VoteTop.BackButton");
 	}
 
 	public String getChestVoteTopItemLore() {

VotingPlugin/src/com/bencodez/votingplugin/listeners/BungeeVotifierEvent.java

@@ -0,0 +1,15 @@
+package com.bencodez.votingplugin.listeners;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.events.PlayerVoteEvent;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+
+public class BungeeVotifierEvent {
+	public void send(VotingPluginMain plugin, PlayerVoteEvent event) {
+		plugin.debug("Triggering vote event");
+		VotifierEvent e = new VotifierEvent(
+				new Vote(event.getServiceSite(), event.getPlayer(), "VotingPlugin", "" + event.getTime()));
+		plugin.getServer().getPluginManager().callEvent(e);
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerCommandSendListener.java

@@ -1,53 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import java.util.ArrayList;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandSendEvent;
-
-import com.bencodez.votingplugin.VotingPluginMain;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PlayerJoinEvent.
- */
-@Deprecated
-public class PlayerCommandSendListener implements Listener {
-
-	@SuppressWarnings("unused")
-	private VotingPluginMain plugin;
-
-	public PlayerCommandSendListener(VotingPluginMain plugin) {
-		this.plugin = plugin;
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onTab(PlayerCommandSendEvent event) {
-		if (plugin.getConfigFile().isDisableAdvancedTab()) {
-			return;
-		}
-		ArrayList<String> removeCmds = new ArrayList<String>();
-		if (!VotingPluginMain.plugin.getAdvancedTab().containsKey(event.getPlayer().getUniqueId())) {
-			ArrayList<String> whiteListed = new ArrayList<String>();
-			for (String cmd : event.getCommands()) {
-				if (plugin.getCommandLoader().isVotingPluginCommand(event.getPlayer(), cmd)) {
-					if (!plugin.getCommandLoader().hasPermission(event.getPlayer(), cmd)
-							&& !whiteListed.contains(cmd)) {
-						removeCmds.add(cmd);
-						// plugin.debug("removed " + cmd);
-					} else {
-						removeCmds.remove(cmd);
-						whiteListed.add(cmd);
-						// plugin.debug("has " + cmd);
-					}
-				}
-			}
-			VotingPluginMain.plugin.getAdvancedTab().put(event.getPlayer().getUniqueId(), removeCmds);
-		} else {
-			removeCmds = VotingPluginMain.plugin.getAdvancedTab().get(event.getPlayer().getUniqueId());
-		}
-		event.getCommands().removeAll(removeCmds);
-	}
-}

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerInteract.java

@@ -39,44 +39,51 @@ public class PlayerInteract implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onPlayerInteract(PlayerInteractEvent event) {
-		Player player = event.getPlayer();
-		if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-			// plugin.debug("Checking for sign click");
-			if (event.getClickedBlock().getState() instanceof Sign) {
-				// plugin.debug(player.getName() + " right clicked a sign");
-				for (SignHandler sign : plugin.getSigns().getSigns()) {
-					if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
-						// plugin.debug(player.getName() +
-						// " right clicked a top voter sign, sending message");
-						UserManager.getInstance().getVotingPluginUser(player).sendMessage(sign.getRightClickMessage());
+		if (plugin.getConfigFile().isDisableInteractEvent()) {
+			return;
+		}
+		if (plugin.getSigns().getSigns().size() > 0) {
+			Player player = event.getPlayer();
+			if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+				// plugin.debug("Checking for sign click");
+				if (event.getClickedBlock().getState() instanceof Sign) {
+					// plugin.debug(player.getName() + " right clicked a sign");
+					for (SignHandler sign : plugin.getSigns().getSigns()) {
+						if (sign.isLocationSame(event.getClickedBlock().getLocation())) {
+							// plugin.debug(player.getName() +
+							// " right clicked a top voter sign, sending message");
+							UserManager.getInstance().getVotingPluginUser(player)
+									.sendMessage(sign.getRightClickMessage());
 
-						if (!sign.isSkullSet()) {
-							if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
-									"VotingPlugin.Sign.Create")
-									|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
-											"VotingPlugin.Admin")) {
-								player.sendMessage("Skull not set, click to set skull");
-								PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+							if (!sign.isSkullSet()) {
+								if (PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+										"VotingPlugin.Sign.Create")
+										|| PlayerUtils.getInstance().hasServerPermission(event.getPlayer().getName(),
+												"VotingPlugin.Admin")) {
+									player.sendMessage("Skull not set, click to set skull");
+									PlayerUtils.getInstance().setPlayerMeta(player, "skullset", sign.getSign());
+								}
 							}
 						}
 					}
-				}
 
-			} else if (event.getClickedBlock().getState() instanceof Skull) {
-				Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
-				if (ob != null) {
-					String sign1 = (String) ob;
-					for (SignHandler sign : plugin.getSigns().getSigns()) {
-						if (sign.getSign().equals(sign1)) {
-							sign.setSkullLocation(event.getClickedBlock().getLocation());
-							sign.storeSign();
-							sign.checkSkulls();
-							player.sendMessage("Skull set");
+				} else if (event.getClickedBlock().getState() instanceof Skull) {
+					Object ob = PlayerUtils.getInstance().getPlayerMeta(player, "skullset");
+					if (ob != null) {
+						String sign1 = (String) ob;
+						for (SignHandler sign : plugin.getSigns().getSigns()) {
+							if (sign.getSign().equals(sign1)) {
+								sign.setSkullLocation(event.getClickedBlock().getLocation());
+								sign.storeSign();
+								sign.checkSkulls();
+								player.sendMessage("Skull set");
+							}
 						}
+						PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
 					}
-					PlayerUtils.getInstance().setPlayerMeta(player, "skullset", null);
 				}
 			}
+
 		}
 	}
 }

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -64,6 +64,10 @@ public class PlayerVoteListener implements Listener {
 		if (event.isBungee()) {
 			plugin.debug("BungeePlayerVote forcebungee: " + event.isForceBungee() + ", bungeetotals: "
 					+ event.getBungeeTextTotals());
+
+			if (plugin.getBungeeSettings().isTriggerVotifierEvent()) {
+				new BungeeVotifierEvent().send(plugin, event);
+			}
 		}
 
 		VoteSite voteSite = event.getVoteSite();
@@ -113,6 +117,10 @@ public class PlayerVoteListener implements Listener {
 				}
 			}
 
+			if (plugin.getBroadcastHandler() != null) {
+				plugin.getBroadcastHandler().onVote(playerName);
+			}
+
 			// update last vote time
 			if (event.getTime() != 0) {
 				user.setTime(voteSite, event.getTime());

VotingPlugin/src/com/bencodez/votingplugin/listeners/VotiferEvent.java

@@ -44,6 +44,10 @@ public class VotiferEvent implements Listener {
 		final String voteSite = vote.getServiceName();
 		final String IP = vote.getAddress();
 		final String voteUsername = vote.getUsername().trim();
+		if (IP.equals("VotingPlugin")) {
+			// ignore own plugin calls of event
+			return;
+		}
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
 			@Override

VotingPlugin/src/com/bencodez/votingplugin/objects/VoteSite.java

@@ -83,6 +83,10 @@ public class VoteSite {
 	@Getter
 	@Setter
 	private boolean waitUntilVoteDelay;
+	
+	@Getter
+	@Setter
+	private boolean ignoreCanVote;
 
 	public VoteSite(VotingPluginMain plugin, String siteName) {
 		this.plugin = plugin;
@@ -101,6 +105,9 @@ public class VoteSite {
 	 * @param checkBungee check bungee broadcast
 	 */
 	public void broadcastVote(VotingPluginUser user, boolean checkBungee) {
+		if (plugin.getConfigFile().isFormatAlternateBroadcastEnabled()) {
+			return;
+		}
 		if (!user.isVanished()) {
 			if (checkBungee && plugin.getBungeeSettings().isBungeeBroadcast()
 					&& plugin.getBungeeSettings().isUseBungeecoord()) {
@@ -228,6 +235,7 @@ public class VoteSite {
 		waitUntilVoteDelay = plugin.getConfigVoteSites().getWaitUntilVoteDelay(key);
 		timeOffSet = plugin.getConfigVoteSites().getTimeOffSet(key);
 		hidden = plugin.getConfigVoteSites().getVoteSiteHidden(key);
+		ignoreCanVote = plugin.getConfigVoteSites().getVoteSiteIgnoreCanVote(key);
 	}
 
 	public boolean isVaidServiceSite() {

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -193,7 +193,8 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		}
 	}
 
-	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals, boolean wasOnline) {
+	public void bungeeVotePluginMessaging(String service, long time, BungeeMessageData text, boolean setTotals,
+			boolean wasOnline) {
 		if (plugin.getBungeeSettings().isUseBungeecoord()) {
 			VotingPluginMain.plugin.debug("Pluginmessaging vote for " + getPlayerName() + " on " + service);
 
@@ -233,9 +234,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 	public boolean canVoteAny() {
 		for (VoteSite voteSite : plugin.getVoteSites()) {
-			boolean canVote = canVoteSite(voteSite);
-			if (canVote) {
-				return true;
+			if (!voteSite.isIgnoreCanVote()) {
+				boolean canVote = canVoteSite(voteSite);
+				if (canVote) {
+					return true;
+				}
 			}
 		}
 		return false;