-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/ru/nightmirror/wlbytime/shared/database/Database.java
- Loading branch information
Showing
14 changed files
with
219 additions
and
163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
src/main/java/ru/nightmirror/wlbytime/interfaces/database/IDatabase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| package ru.nightmirror.wlbytime.interfaces.database; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public interface IDatabase { | ||
|
|
||
| void reload(); | ||
| void addPlayer(String nickname, long until); | ||
| Boolean checkPlayer(String nickname); | ||
| Boolean checkPlayer(long until); | ||
| long getUntil(String nickname); | ||
| void setUntil(String nickname, long until); | ||
| void removePlayer(String nickname); | ||
| List<String> getAll(); | ||
| Map<String, Long> getAll(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 63 additions & 2 deletions
65
src/main/java/ru/nightmirror/wlbytime/shared/common/Checker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,84 @@ | ||
| package ru.nightmirror.wlbytime.shared.common; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.scheduler.BukkitRunnable; | ||
| import org.bukkit.scheduler.BukkitTask; | ||
| import ru.nightmirror.wlbytime.interfaces.database.IDatabase; | ||
| import ru.nightmirror.wlbytime.misc.convertors.ColorsConvertor; | ||
| import ru.nightmirror.wlbytime.shared.WhitelistByTime; | ||
| import ru.nightmirror.wlbytime.shared.api.events.PlayerRemovedFromWhitelistEvent; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| @RequiredArgsConstructor | ||
| public class Checker { | ||
|
|
||
| private final WhitelistByTime plugin; | ||
| private final IDatabase database; | ||
| public static Map<String, Long> players = new HashMap<String, Long>(); | ||
| final public static List<String> toKick = new ArrayList<>(); | ||
|
|
||
| private String casedName(String nickname) { | ||
| if (!plugin.getConfig().getBoolean("case-sensitive", true)) { | ||
| nickname = nickname.toLowerCase(Locale.ROOT); | ||
| } | ||
| return nickname; | ||
| } | ||
|
|
||
| private void check() { | ||
| Map<String, Long> all = database.getAll(); | ||
| synchronized (players) { | ||
| players = all; | ||
| } | ||
|
|
||
| for (Map.Entry<String, Long> playerEntry: all.entrySet()) { | ||
| if (!database.checkPlayer(playerEntry.getValue())) { | ||
| database.removePlayer(playerEntry.getKey()); | ||
| } | ||
| } | ||
|
|
||
| for (Player player : plugin.getServer().getOnlinePlayers()) { | ||
| String name = casedName(player.getName()); | ||
| if(!all.containsKey(name)) { | ||
| synchronized (toKick) { | ||
| toKick.add(casedName(name)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void kick(String nickname) { | ||
| if (plugin.isWhitelistEnabled()) { | ||
| Player player = plugin.getServer().getPlayer(nickname); | ||
| if (player != null && player.isOnline()) { | ||
| List<String> message = ColorsConvertor.convert(plugin.getConfig().getStringList("minecraft-commands.you-not-in-whitelist-kick")); | ||
| player.kickPlayer(String.join("\n", message)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public BukkitTask start(final int delaySeconds) { | ||
| return new BukkitRunnable() { | ||
| new BukkitRunnable() { | ||
| @Override | ||
| public void run() { | ||
| database.getAll(); | ||
| synchronized (toKick) { | ||
| for (String player : toKick) { | ||
| PlayerRemovedFromWhitelistEvent event = new PlayerRemovedFromWhitelistEvent(player); | ||
| Bukkit.getPluginManager().callEvent(event); | ||
|
|
||
| if (event.isCancelled()) return; | ||
|
|
||
| kick(player); | ||
| } | ||
|
|
||
| if(toKick.size() > 0) { | ||
| toKick.removeAll(toKick); | ||
| } | ||
| } | ||
| } | ||
| }.runTaskTimer(plugin, 20L * delaySeconds, 20L * delaySeconds); | ||
| return Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, this::check, 20L * delaySeconds, 20L * delaySeconds); | ||
| } | ||
| } |
Oops, something went wrong.