Merge pull request #226 from Ben12345rocks/5.9.3

5.9.3
BenCodez · Jul 16, 2017 · 198fe10 · 198fe10
2 parents 80ae9db + ab8dd96
commit 198fe10
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/VotingPlugin/Resources/VoteSites.yml b/VotingPlugin/Resources/VoteSites.yml
@@ -31,6 +31,9 @@ VoteSites:
  # Reset vote delay each day (for certain sites that do this)
  VoteDelayDaily: false
 
+ # If true, rewards can be executed offline (required ForceOffline to be true in the reward)
+ GiveOffline: false
+
  # VoteSite Material for GUI's
  Item:
  Material: 'DIAMOND'

diff --git a/VotingPlugin/pom.xml b/VotingPlugin/pom.xml
@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.Ben12345rocks</groupId>
  <artifactId>VotingPlugin</artifactId>
- <version>5.9.2</version>
+ <version>5.9.3</version>
  <packaging>jar</packaging>
  <name>VotingPlugin</name>
  <properties>

diff --git a/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/ConfigVoteSites.java b/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Config/ConfigVoteSites.java
@@ -110,6 +110,10 @@ public String getRewardsPath(String siteName) {
  public String getEverySiteRewardPath() {
  return "EverySiteReward";
  }
+
+ public boolean getVoteSiteGiveOffline(String site) {
+ return getData(site).getBoolean("GiveOffline");
+ }
 
  /**
  * Gets the service site.

diff --git a/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/VotiferEvent.java b/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/VotiferEvent.java
@@ -45,7 +45,7 @@ public static void playerVote(final String playerName, final String voteSiteURL)
  Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
  @Override
  public void run() {
- synchronized (plugin) {
+ synchronized (configVoteSites) {
  User user = UserManager.getInstance().getVotingPluginUser(playerName);
  if (!user.hasLoggedOnBefore() && !config.allowUnJoined()) {
  plugin.getLogger().warning("Player " + playerName
@@ -94,7 +94,7 @@ public void run() {
  OtherVoteReward.getInstance().checkCumualativeVotes(user);
  OtherVoteReward.getInstance().checkMilestone(user);
 
- if (user.isOnline()) {
+ if (user.isOnline() || voteSite.isGiveOffline()) {
  user.playerVote(voteSite, true, false);
  } else {
  user.addOfflineVote(voteSite.getKey());
@@ -141,14 +141,12 @@ public void onVotiferEvent(VotifierEvent event) {
  plugin.debug("PlayerUsername: " + voteUsername);
  plugin.debug("VoteSite: " + voteSite);
 
-
-
  Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
  @Override
  public void run() {
  String voteSiteName = plugin.getVoteSiteName(voteSite);
- 
+
  PlayerVoteEvent voteEvent = new PlayerVoteEvent(plugin.getVoteSite(voteSiteName),
  UserManager.getInstance().getVotingPluginUser(voteUsername));
  plugin.getServer().getPluginManager().callEvent(voteEvent);

diff --git a/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java b/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java
@@ -15,7 +15,7 @@
 import java.util.TimerTask;
 
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -664,7 +664,7 @@ public void run() {
  AdvancedCoreHook.getInstance().getJavascriptEngineRequests().add(new JavascriptPlaceholderRequest("User") {
 
  @Override
- public Object getObject(Player player) {
+ public Object getObject(OfflinePlayer player) {
  return getUserManager().getVotingPluginUser(player);
  }
  });

diff --git a/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/VoteSite.java b/VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Objects/VoteSite.java
@@ -40,14 +40,16 @@ public class VoteSite {
 
  /** The enabled. */
  private boolean enabled;
- 
+
  private boolean voteDelayDaily;
 
  /** The priority. */
  private int priority;
 
  private ConfigurationSection item;
 
+ private boolean giveOffline;
+
  /**
  * Instantiates a new vote site.
  *
@@ -77,7 +79,8 @@ public boolean isVoteDelayDaily() {
  }
 
  /**
- * @param voteDelayDaily the voteDelayDaily to set
+ * @param voteDelayDaily
+ * the voteDelayDaily to set
  */
  public void setVoteDelayDaily(boolean voteDelayDaily) {
  this.voteDelayDaily = voteDelayDaily;
@@ -198,6 +201,28 @@ public void init() {
  }
  item = configVoteSites.getItem(key);
  voteDelayDaily = configVoteSites.getVoteSiteResetVoteDelayDaily(key);
+ giveOffline = configVoteSites.getVoteSiteGiveOffline(key);
+ }
+
+ /**
+ * @return the giveOffline
+ */
+ public boolean isGiveOffline() {
+ return giveOffline;
+ }
+
+ /**
+ * @param giveOffline the giveOffline to set
+ */
+ public void setGiveOffline(boolean giveOffline) {
+ this.giveOffline = giveOffline;
+ }
+
+ /**
+ * @param item the item to set
+ */
+ public void setItem(ConfigurationSection item) {
+ this.item = item;
  }
 
  /**