Spigot / CraftBukkit / 648196070e5

Commits

Doc authored and md_5 committed 648196070e5 01 Jul 2023

SPIGOT-6455, SPIGOT-7030, #1054: Improve ban API

src/main/java/org/bukkit/craftbukkit/ban/CraftIpBanEntry.java

Moved

--
+package org.bukkit.craftbukkit;
-+
+package org.bukkit.craftbukkit.ban;
-2
--
+import java.io.IOException;
-+
+import java.net.InetSocketAddress;
-+
+import java.time.Instant;
-5
+import java.util.Date;
--
+import java.util.logging.Level;
-6
+import net.minecraft.server.players.IpBanEntry;
-7
+import net.minecraft.server.players.IpBanList;
--
+import org.bukkit.Bukkit;
-+
+import org.bukkit.BanEntry;
-9
--
+public final class CraftIpBanEntry implements org.bukkit.BanEntry {
-+
+public final class CraftIpBanEntry implements BanEntry<InetSocketAddress> {
-+
+    private static final Date minorDate = Date.from(Instant.parse("1899-12-31T04:00:00Z"));
-12
+    private final IpBanList list;
-13
+    private final String target;
-14
+    private Date created;
-15
+    private String source;
-16
+    private Date expiration;
-17
+    private String reason;
-18
-19
+    public CraftIpBanEntry(String target, IpBanEntry entry, IpBanList list) {
-20
+        this.list = list;
-21
+        this.target = target;
-22
+        this.created = entry.getCreated() != null ? new Date(entry.getCreated().getTime()) : null;
-23
+        this.source = entry.getSource();
-24
+        this.expiration = entry.getExpires() != null ? new Date(entry.getExpires().getTime()) : null;
-25
+        this.reason = entry.getReason();
-26
+    }
-27
-28
+    @Override
-29
+    public String getTarget() {
-30
+        return this.target;
-31
+    }
-32
-+
+    @Override
-+
+    public InetSocketAddress getBanTarget() {
-+
+        return new InetSocketAddress(this.target, 0);
-+
+    }
-+
-38
+    @Override
-39
+    public Date getCreated() {
-40
+        return this.created == null ? null : (Date) this.created.clone();
-41
+    }
-42
-43
+    @Override
-44
+    public void setCreated(Date created) {
-45
+        this.created = created;
-46
+    }
-47
-55
+        this.source = source;
-56
+    }
-57
-58
+    @Override
-59
+    public Date getExpiration() {
-60
+        return this.expiration == null ? null : (Date) this.expiration.clone();
-61
+    }
-62
-63
+    @Override
-64
+    public void setExpiration(Date expiration) {
--
+        if (expiration != null && expiration.getTime() == new Date(0, 0, 0, 0, 0, 0).getTime()) {
-+
+        if (expiration != null && expiration.getTime() == minorDate.getTime()) {
-66
+            expiration = null; // Forces "forever"
-67
+        }
-68
-69
+        this.expiration = expiration;
-70
+    }
-71
-72
+    @Override
-73
+    public String getReason() {
-74
+        return this.reason;
-75
+    }
-76
-77
+    @Override
-78
+    public void setReason(String reason) {
-79
+        this.reason = reason;
-80
+    }
-81
-82
+    @Override
-83
+    public void save() {
--
+        IpBanEntry entry = new IpBanEntry(target, this.created, this.source, this.expiration, this.reason);
-+
+        IpBanEntry entry = new IpBanEntry(this.target, this.created, this.source, this.expiration, this.reason);
-85
+        this.list.add(entry);
--
+        try {
--
+            this.list.save();
--
+        } catch (IOException ex) {
--
+            Bukkit.getLogger().log(Level.SEVERE, "Failed to save banned-ips.json, {0}", ex.getMessage());
--
+        }
-+
+    }
-+
-+
+    @Override
-+
+    public void remove() {
-+
+        this.list.remove(target);
-91
+    }
-92
+}

CraftBukkit

Commits

Jira Issues

Add shortcut