Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-01 23:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

That's right, Redis is working!

Browse Source 
- Fix end date for bans not being correct
- Add a lot of debug information
- Add ban reasons
This commit is contained in:
Telesphoreo
2022-02-04 02:18:07 -06:00
parent 753dba8986
commit 93a8a10212
13 changed files with 128 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dev/plex/punishment/Punishment.java
View File

@ -12,7 +12,6 @@ import lombok.Setter;
@Setter
public class Punishment
{
private final UUID punished;
private final UUID punisher;
@ -47,5 +46,4 @@ public class Punishment
{
return new Gson().fromJson(json, Punishment.class);
}
}

19
src/main/java/dev/plex/punishment/PunishmentManager.java
View File

@ -3,8 +3,10 @@ package dev.plex.punishment;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import dev.plex.Plex;
import dev.plex.PlexBase;
import dev.plex.banning.Ban;
import dev.plex.player.PunishedPlayer;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils;
import java.io.File;
import java.io.FileInputStream;
@ -22,9 +24,8 @@ import org.bukkit.scheduler.BukkitRunnable;
import org.json.JSONObject;
import org.json.JSONTokener;
public class PunishmentManager
public class PunishmentManager extends PlexBase
{
public void insertPunishment(PunishedPlayer player, Punishment punishment)
{
File file = player.getPunishmentsFile();
@ -36,6 +37,11 @@ public class PunishmentManager
JSONTokener tokener = new JSONTokener(new FileInputStream(file));
JSONObject object = new JSONObject(tokener);
object.getJSONObject(punishment.getPunished().toString()).getJSONArray("punishments").put(punishment.toJSON());
if (plugin.getRedisConnection().isEnabled())
{
plugin.getRedisConnection().getJedis().set(player.getUuid(), object.toString());
PlexLog.debug("Added " + player.getUuid() + "'s punishment to the Redis database.");
}
FileWriter writer = new FileWriter(file);
writer.append(object.toString(8));
@ -52,13 +58,17 @@ public class PunishmentManager
punishments.put("punishments", punishmentList);
object.put(punishment.getPunished().toString(), punishments);
if (plugin.getRedisConnection().isEnabled())
{
plugin.getRedisConnection().getJedis().set(player.getUuid(), object.toString());
PlexLog.debug("Added " + player.getUuid() + "'s punishment to the Redis database.");
}
FileWriter writer = new FileWriter(file);
writer.append(object.toString(8));
writer.flush();
writer.close();
}
}
catch (IOException e)
{
@ -107,8 +117,6 @@ public class PunishmentManager
Bukkit.getLogger().info("Unfroze");
}
}.runTaskLater(Plex.get(), 20 * seconds);
}
else if (punishment.getType() == PunishmentType.MUTE)
{
@ -132,5 +140,4 @@ public class PunishmentManager
issuePunishment(player, punishment);
insertPunishment(player, punishment);
}
}

1
src/main/java/dev/plex/punishment/PunishmentType.java
View File

@ -3,5 +3,4 @@ package dev.plex.punishment;
public enum PunishmentType
{
MUTE, FREEZE, BAN;
}