SteamWar/BungeeCore
Archiviert
13
2

Revert some stuff
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
yoyosource 2022-04-05 19:47:48 +02:00
Ursprung 7b5ce77e93
Commit 6b8d46d75a

Datei anzeigen

@ -51,8 +51,6 @@ public class Fabric extends BasicListener {
private static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>(); private static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>(); private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
private static final Object OBJECT = new Object();
{ {
neededMods.add("java"); neededMods.add("java");
neededMods.add("minecraft"); neededMods.add("minecraft");
@ -60,7 +58,7 @@ public class Fabric extends BasicListener {
neededMods.add("steamwarmodsender"); neededMods.add("steamwarmodsender");
BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> { BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
synchronized (OBJECT) { synchronized (expectPluginMessage) {
for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) { for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) { if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey()); banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
@ -84,7 +82,7 @@ public class Fabric extends BasicListener {
SteamwarUser user = SteamwarUser.get(player.getUniqueId()); SteamwarUser user = SteamwarUser.get(player.getUniqueId());
if (!checkedPlayers.containsKey(player)) { if (!checkedPlayers.containsKey(player)) {
synchronized (OBJECT) { synchronized (expectPluginMessage) {
if (expectPluginMessage.containsKey(player)) { if (expectPluginMessage.containsKey(player)) {
banPlayer(user, player); banPlayer(user, player);
return; return;
@ -156,7 +154,7 @@ public class Fabric extends BasicListener {
@EventHandler @EventHandler
public void onServerSwitchEvent(ServerSwitchEvent e) { public void onServerSwitchEvent(ServerSwitchEvent e) {
if (e.getFrom() == null) return; if (e.getFrom() == null) return;
synchronized (OBJECT) { synchronized (expectPluginMessage) {
expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis()); expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
} }
} }
@ -189,8 +187,8 @@ public class Fabric extends BasicListener {
} }
public static void remove(ProxiedPlayer player) { public static void remove(ProxiedPlayer player) {
synchronized (OBJECT) {
checkedPlayers.remove(player); checkedPlayers.remove(player);
synchronized (expectPluginMessage) {
expectPluginMessage.remove(player); expectPluginMessage.remove(player);
} }
} }