mirror of
https://github.com/colbster937/originblacklist.git
synced 2026-02-04 11:07:41 +00:00
Compare commits
1 Commits
v2.0.2+269
...
v2.0.2+50e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50e2a954cd |
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
|
||||
|
||||
import net.lax1dude.eaglercraft.backend.server.api.event.IBaseServerEvent;
|
||||
|
||||
@SuppressWarnings({ "rawtypes" })
|
||||
public abstract class OriginBlacklistEvent {
|
||||
private final EnumConnectionType connectionType;
|
||||
private final IBaseServerEvent eaglerEvent;
|
||||
|
||||
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
|
||||
|
||||
import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
|
||||
|
||||
@SuppressWarnings({ "rawtypes" })
|
||||
public final class OriginBlacklistLoginEvent extends OriginBlacklistEvent {
|
||||
public OriginBlacklistLoginEvent(final IEaglercraftLoginEvent eaglerEvent, final Object javaEvent,
|
||||
final EnumConnectionType connectionType, final OPlayer player) {
|
||||
|
||||
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
|
||||
|
||||
import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
|
||||
|
||||
@SuppressWarnings({ "rawtypes" })
|
||||
public final class OriginBlacklistMOTDEvent extends OriginBlacklistEvent {
|
||||
public OriginBlacklistMOTDEvent(final IEaglercraftMOTDEvent eaglerEvent, final Object javaEvent,
|
||||
final EnumConnectionType connectionType, final OPlayer player) {
|
||||
|
||||
@@ -109,13 +109,31 @@ public final class OPlayer {
|
||||
port = (c >= '0' && c <= '9');
|
||||
}
|
||||
|
||||
if (port && a.indexOf('.') != -1) {
|
||||
if (port) {
|
||||
if (a.indexOf('.') != -1) {
|
||||
addr = a;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int c = 0;
|
||||
boolean hex = true;
|
||||
for (int j = 0; j < addr.length(); j++) {
|
||||
char ch = addr.charAt(j);
|
||||
if (ch == ':') {
|
||||
c++;
|
||||
} else if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) {
|
||||
hex = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (hex && c == 6 && addr.indexOf("::") == -1) {
|
||||
addr = addr + "::";
|
||||
}
|
||||
}
|
||||
|
||||
return addr;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.util.CachedServerIcon;
|
||||
import org.semver4j.Semver;
|
||||
|
||||
@SuppressWarnings({ "rawtypes" })
|
||||
public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
|
||||
private boolean papiPlaceholdersEnabled;
|
||||
private Object papi;
|
||||
|
||||
@@ -33,7 +33,7 @@ import org.bstats.bungeecord.Metrics;
|
||||
import org.bstats.charts.AdvancedPie;
|
||||
import org.semver4j.Semver;
|
||||
|
||||
@SuppressWarnings({ "deprecation" })
|
||||
@SuppressWarnings({ "deprecation", "rawtypes" })
|
||||
public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin {
|
||||
private ProxyServer proxy;
|
||||
private boolean papiPlaceholdersEnabled;
|
||||
|
||||
@@ -39,7 +39,7 @@ import org.bstats.velocity.Metrics.Factory;
|
||||
import org.semver4j.Semver;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
@SuppressWarnings({ "deprecation", "unchecked" })
|
||||
@SuppressWarnings({ "deprecation", "unchecked", "rawtypes" })
|
||||
public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
|
||||
private final PluginContainer plugin;
|
||||
private final Factory metricsFactory;
|
||||
|
||||
Reference in New Issue
Block a user