fix patches

This commit is contained in:
mohammed jasem alaajel 2021-07-26 21:35:18 +04:00
parent fa7df73f45
commit 56455e6ca9
2 changed files with 436 additions and 2079 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
From 979a51e843ef6c205ad839317f99ac6a7ea76062 Mon Sep 17 00:00:00 2001 From 914ab071cda9943fb43d8544cd75d971f2e699cb Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com> From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com>
Date: Mon, 14 Jun 2021 22:27:22 +0400 Date: Mon, 14 Jun 2021 22:27:22 +0400
Subject: [PATCH] Added old commits from forked repo Fastlogin Subject: [PATCH] Added old commits from forked repo Fastlogin
@ -6,10 +6,10 @@ Subject: [PATCH] Added old commits from forked repo Fastlogin
commits: \nAuto-add - character for offline mode users\nFix empty database getting users marked as cracked falsely\nDon't save offline mode user to database\nalways use false to fix an error\nsome debug stuff...\nadd GovindasPreSecondAttemptEvent\nshade sqlite so we can stop using mariadb for fastlogin commits: \nAuto-add - character for offline mode users\nFix empty database getting users marked as cracked falsely\nDon't save offline mode user to database\nalways use false to fix an error\nsome debug stuff...\nadd GovindasPreSecondAttemptEvent\nshade sqlite so we can stop using mariadb for fastlogin
diff --git a/bungee/pom.xml b/bungee/pom.xml diff --git a/bungee/pom.xml b/bungee/pom.xml
index 2e6f977..9f9c28a 100644 index 7cbdc04..eafeda5 100644
--- a/bungee/pom.xml --- a/bungee/pom.xml
+++ b/bungee/pom.xml +++ b/bungee/pom.xml
@@ -170,5 +170,11 @@ @@ -176,5 +176,11 @@
<optional>true</optional> <optional>true</optional>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -22,10 +22,10 @@ index 2e6f977..9f9c28a 100644
</dependencies> </dependencies>
</project> </project>
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
index 8a81b14..db8f269 100644 index 8777a60..fef86f5 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
@@ -42,6 +42,7 @@ import java.lang.invoke.MethodHandle; @@ -40,6 +40,7 @@ import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup; import java.lang.invoke.MethodHandles.Lookup;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -33,7 +33,7 @@ index 8a81b14..db8f269 100644
import java.util.UUID; import java.util.UUID;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.PendingConnection;
@@ -167,6 +168,52 @@ public class ConnectListener implements Listener { @@ -157,6 +158,52 @@ public class ConnectListener implements Listener {
} }
} }
} }
@ -105,7 +105,7 @@ index c52f41a..1d1c8d9 100644
softDepends: softDepends:
# BungeeCord auth plugins # BungeeCord auth plugins
diff --git a/core/pom.xml b/core/pom.xml diff --git a/core/pom.xml b/core/pom.xml
index ccdc63a..3491ef0 100644 index 17535a4..46fc0a9 100644
--- a/core/pom.xml --- a/core/pom.xml
+++ b/core/pom.xml +++ b/core/pom.xml
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
@ -132,7 +132,7 @@ index ccdc63a..3491ef0 100644
<dependency> <dependency>
<groupId>org.geysermc.floodgate</groupId> <groupId>org.geysermc.floodgate</groupId>
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java diff --git a/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java b/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java
index 94500cb..b304559 100644 index 94500cb..316445c 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java --- a/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java
@@ -142,9 +142,8 @@ public class AuthStorage { @@ -142,9 +142,8 @@ public class AuthStorage {
@ -175,7 +175,7 @@ index 94500cb..b304559 100644
saveStmt.setString(1, uuid); saveStmt.setString(1, uuid);
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
index 7efb157..b417e64 100644 index 7efb157..feac10d 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
@@ -92,7 +92,13 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio @@ -92,7 +92,13 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
@ -194,7 +194,7 @@ index 7efb157..b417e64 100644
} catch (Exception ex) { } catch (Exception ex) {
core.getPlugin().getLog().warn("ERROR ON FORCE LOGIN of {}", getName(player), ex); core.getPlugin().getLog().warn("ERROR ON FORCE LOGIN of {}", getName(player), ex);
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
index ec129a8..5490673 100644 index ec129a8..3f05090 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
@@ -34,6 +34,8 @@ import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent; @@ -34,6 +34,8 @@ import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
@ -250,7 +250,7 @@ index ec129a8..5490673 100644
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java
new file mode 100644 new file mode 100644
index 0000000..007083e index 0000000..5ac3cc9
--- /dev/null --- /dev/null
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/event/GovindasPreSecondAttemptEvent.java
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
@ -292,10 +292,10 @@ index 0000000..007083e
+// LimeLogin end +// LimeLogin end
\ No newline at end of file \ No newline at end of file
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index ecb1c44..477c026 100644 index 8e04896..b495031 100644
--- a/core/src/main/resources/config.yml --- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml +++ b/core/src/main/resources/config.yml
@@ -235,7 +235,7 @@ autoRegisterFloodgate: false @@ -246,7 +246,7 @@ autoRegisterFloodgate: false
# Recommended is the use of MariaDB (a better version of MySQL) # Recommended is the use of MariaDB (a better version of MySQL)
# Single file SQLite database # Single file SQLite database
@ -305,5 +305,5 @@ index ecb1c44..477c026 100644
database: '{pluginDir}/FastLogin.db' database: '{pluginDir}/FastLogin.db'
-- --
2.32.0.windows.1 2.25.1