Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/ptl/ajneb97/PlayerTimeLimit.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.PluginManager;
Expand Down
2 changes: 0 additions & 2 deletions src/ptl/ajneb97/api/ExpansionPlayerTimeLimit.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package ptl.ajneb97.api;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;

import me.clip.placeholderapi.expansion.PlaceholderExpansion;
Expand Down
1 change: 1 addition & 0 deletions src/ptl/ajneb97/api/PlayerTimeLimitAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
public class PlayerTimeLimitAPI {

private static PlayerTimeLimit plugin;
@SuppressWarnings("static-access")
public PlayerTimeLimitAPI(PlayerTimeLimit plugin) {
this.plugin = plugin;
}
Expand Down
1 change: 0 additions & 1 deletion src/ptl/ajneb97/configs/MainConfigManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.util.ArrayList;
import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;

import ptl.ajneb97.PlayerTimeLimit;
Expand Down
3 changes: 1 addition & 2 deletions src/ptl/ajneb97/libs/actionbar/ActionBarAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.lang.reflect.Field;
import java.lang.reflect.Method;

import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
Expand Down Expand Up @@ -87,7 +88,6 @@ public static void sendActionBar(final Player player, final String message, int
if (duration >= 0) {
// Sends empty message at the end of the duration. Allows messages shorter than 3 seconds, ensures precision.
new BukkitRunnable() {
@Override
public void run() {
sendActionBar(player, "");
}
Expand All @@ -98,7 +98,6 @@ public void run() {
while (duration > 40) {
duration -= 40;
new BukkitRunnable() {
@Override
public void run() {
sendActionBar(player, message);
}
Expand Down
6 changes: 2 additions & 4 deletions src/ptl/ajneb97/listeners/PlayerListener.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package ptl.ajneb97.listeners;

import java.util.ArrayList;
import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;
Expand All @@ -20,10 +18,10 @@

import ptl.ajneb97.PlayerTimeLimit;
import ptl.ajneb97.configs.MainConfigManager;
import ptl.ajneb97.configs.others.TimeLimit;
import ptl.ajneb97.managers.MensajesManager;
import ptl.ajneb97.managers.PlayerManager;
import ptl.ajneb97.model.TimeLimitPlayer;
import ptl.ajneb97.utils.BypassTimes;

public class PlayerListener implements Listener{

Expand All @@ -47,7 +45,7 @@ public void onPreJoin(PlayerLoginEvent event) {

int currentTime = p.getCurrentTime();
int timeLimit = playerManager.getTimeLimitPlayer(player);
if(currentTime >= timeLimit && timeLimit != 0) {
if(currentTime >= timeLimit && timeLimit != 0 && !BypassTimes.isBypassNow(plugin)) {
FileConfiguration messages = plugin.getMessages();
List<String> msg = messages.getStringList("joinErrorMessage");
String finalMessage = "";
Expand Down
2 changes: 1 addition & 1 deletion src/ptl/ajneb97/managers/MensajesManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import net.md_5.bungee.api.ChatColor;
import ptl.ajneb97.libs.centeredmessages.DefaultFontInfo;

Expand Down
6 changes: 2 additions & 4 deletions src/ptl/ajneb97/managers/PlayerManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;
Expand All @@ -16,6 +14,7 @@
import ptl.ajneb97.configs.MainConfigManager;
import ptl.ajneb97.configs.others.TimeLimit;
import ptl.ajneb97.model.TimeLimitPlayer;
import ptl.ajneb97.utils.BypassTimes;
import ptl.ajneb97.utils.UtilsTime;

public class PlayerManager {
Expand Down Expand Up @@ -71,7 +70,6 @@ public void checkUserTime(final Player player,TimeLimitPlayer p) {
//El jugador ya ha completado su tiempo
final FileConfiguration messages = plugin.getMessages();
new BukkitRunnable() {
@Override
public void run() {
MainConfigManager mainConfig = plugin.getConfigsManager().getMainConfigManager();
if(mainConfig.isWorldWhitelistEnabled()) {
Expand Down Expand Up @@ -99,7 +97,7 @@ public void resetPlayers() {
public boolean hasTimeLeft(TimeLimitPlayer p) {
int currentTime = p.getCurrentTime();
int timeLimit = getTimeLimitPlayer(p.getPlayer());
if(currentTime < timeLimit || timeLimit == 0) {
if(currentTime < timeLimit || timeLimit == 0 || BypassTimes.isBypassNow(plugin)) {
return true;
}
return false;
Expand Down
7 changes: 0 additions & 7 deletions src/ptl/ajneb97/managers/ServerManager.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
package ptl.ajneb97.managers;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;

import ptl.ajneb97.PlayerTimeLimit;
import ptl.ajneb97.configs.MainConfigManager;
import ptl.ajneb97.model.TimeLimitPlayer;
import ptl.ajneb97.utils.UtilsTime;

public class ServerManager {
Expand Down
1 change: 0 additions & 1 deletion src/ptl/ajneb97/tasks/DataSaveTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public void start(int minutes) {
long ticks = minutes*60*20;

new BukkitRunnable() {
@Override
public void run() {
if(end) {
this.cancel();
Expand Down
15 changes: 9 additions & 6 deletions src/ptl/ajneb97/tasks/PlayerTimeTask.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package ptl.ajneb97.tasks;

import java.util.ArrayList;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;

import org.bukkit.Bukkit;
Expand All @@ -14,14 +17,13 @@
import ptl.ajneb97.PlayerTimeLimit;
import ptl.ajneb97.configs.MainConfigManager;
import ptl.ajneb97.configs.others.Notification;
import ptl.ajneb97.configs.others.TimeLimit;
import ptl.ajneb97.libs.actionbar.ActionBarAPI;
import ptl.ajneb97.libs.bossbar.BossBarAPI;
import ptl.ajneb97.managers.MensajesManager;
import ptl.ajneb97.managers.PlayerManager;
import ptl.ajneb97.managers.ServerManager;
import ptl.ajneb97.model.TimeLimitPlayer;
import ptl.ajneb97.utils.UtilsTime;
import ptl.ajneb97.utils.BypassTimes;

public class PlayerTimeTask {

Expand All @@ -32,7 +34,6 @@ public PlayerTimeTask(PlayerTimeLimit plugin) {

public void start() {
new BukkitRunnable() {
@Override
public void run() {
execute();
}
Expand All @@ -42,7 +43,6 @@ public void run() {

public void execute() {
new BukkitRunnable() {
@Override
public void run() {
MainConfigManager mainConfig = plugin.getConfigsManager().getMainConfigManager();

Expand All @@ -62,7 +62,10 @@ public void run() {
p.eliminarBossBar();
continue;
}
p.increaseTime();

if(!BypassTimes.isBypassNow(plugin))
p.increaseTime();

sendActionBar(player,p,actionBar);
sendBossBar(player,p,bossBar,bossBarColor,bossBarStyle);
sendNotification(player,p,mainConfig);
Expand Down
5 changes: 0 additions & 5 deletions src/ptl/ajneb97/tasks/ServerTimeResetTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;

import org.bukkit.Bukkit;
import org.bukkit.scheduler.BukkitRunnable;

import ptl.ajneb97.PlayerTimeLimit;
import ptl.ajneb97.configs.MainConfigManager;
import ptl.ajneb97.model.TimeLimitPlayer;

public class ServerTimeResetTask {

Expand All @@ -22,7 +19,6 @@ public ServerTimeResetTask(PlayerTimeLimit plugin) {

public void start() {
new BukkitRunnable() {
@Override
public void run() {
execute();
}
Expand All @@ -39,7 +35,6 @@ public void execute() {
if(resetTime.equals(currentTime)) {
//REINICIO DE TIEMPO
new BukkitRunnable() {
@Override
public void run() {
plugin.getPlayerManager().resetPlayers();
}
Expand Down
46 changes: 46 additions & 0 deletions src/ptl/ajneb97/utils/BypassTimes.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package ptl.ajneb97.utils;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;

import ptl.ajneb97.PlayerTimeLimit;

public class BypassTimes {

public static boolean isBypassNow(PlayerTimeLimit plugin) {

if (plugin.getConfig().contains("bypass_time")) {
for (String name : plugin.getConfig().getConfigurationSection("bypass_time").getKeys(false)) {

SimpleDateFormat parser = new SimpleDateFormat("HH:mm");

DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HH:mm");
LocalDateTime now = LocalDateTime.now();
String currentTime = dtf.format(now);

try {
Date curTime = parser.parse(currentTime);
Date start = parser.parse((String) plugin.getConfig().getConfigurationSection("bypass_time")
.getConfigurationSection(name).get("start"));
Date end = parser.parse((String) plugin.getConfig().getConfigurationSection("bypass_time")
.getConfigurationSection(name).get("end"));

if (curTime.after(start) && curTime.before(end)) {
return true;
}

} catch (Exception e) {
System.out.println(
"[PlayerTimeLimit] There were some errors within the bypass calculation. Please double-check your config file");
}
return false;
}

}

return false;
}

}
2 changes: 0 additions & 2 deletions src/ptl/ajneb97/utils/UtilsTime.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import java.util.Calendar;

import org.bukkit.Bukkit;

import ptl.ajneb97.managers.MensajesManager;

public class UtilsTime {
Expand Down