Limework/LimeLogin
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove all Auth plugins hooks #2

Merged
ham1255 merged 15 commits from dev/authRemoval into main 2021-06-16 17:18:33 +00:00
Conversation 1 Commits 15 Files Changed 6 +26 -1
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8753b355e8 - Show all commits

7
FastLogin-Patches/0003-removed-hooks-and-commented-them-out.patch
View File

@ -34,7 +34,7 @@ index e26b271..25f1ac2 100644
- registerHook(); - registerHook();
+ // LimeLogin start + // LimeLogin start
+ //registerHook(); + //registerHook();
+ // LimeLogin stop + // LimeLogin end
} }
@Override @Override
@ -57,9 +57,14 @@ index e26b271..25f1ac2 100644
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
logger.error("Couldn't load the auth hook class", ex); logger.error("Couldn't load the auth hook class", ex);
} }
<<<<<<< HEAD
+ } + }
=======
- }
+ } */
>>>>>>> 654e137 (related to main)
+ // LimeLogin end + // LimeLogin end
public void sendPluginMessage(Server server, ChannelMessage message) { public void sendPluginMessage(Server server, ChannelMessage message) {

20
FastLogin-Patches/0005-Removing-all-Auth-related-stuff.patch
View File

@ -65,7 +65,10 @@ index 410b1e4..0136f09 100644
+ // LimeLogin start + // LimeLogin start
+ super(plugin.getCore()); + super(plugin.getCore());
+ // LimeLogin end + // LimeLogin end
<<<<<<< HEAD
=======
>>>>>>> 654e137 (related to main)
this.plugin = plugin; this.plugin = plugin;
this.preLoginEvent = preLoginEvent; this.preLoginEvent = preLoginEvent;
this.connection = connection; this.connection = connection;
@ -310,7 +313,10 @@ index ec3f924..90c9add 100644
+ // LimeLogin start + // LimeLogin start
+ //private AuthPlugin<P> authPlugin; + //private AuthPlugin<P> authPlugin;
+ // LimeLogin end + // LimeLogin end
<<<<<<< HEAD
=======
>>>>>>> 654e137 (related to main)
public FastLoginCore(T plugin) { public FastLoginCore(T plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
@ -325,8 +331,11 @@ index ec3f924..90c9add 100644
} }
+ */ + */
+ // LimeLogin end + // LimeLogin end
<<<<<<< HEAD
=======
>>>>>>> 654e137 (related to main)
public RateLimiter getRateLimiter() { public RateLimiter getRateLimiter() {
return rateLimiter; return rateLimiter;
@ -520,7 +529,10 @@ index 5490673..dabe324 100644
- this.authHook = authHook; - this.authHook = authHook;
this.floodgateHook = new FloodgateHook<>(core); this.floodgateHook = new FloodgateHook<>(core);
} }
<<<<<<< HEAD
=======
>>>>>>> 654e137 (related to main)
+ // LimeLogin end + // LimeLogin end
+ +
@ -528,15 +540,23 @@ index 5490673..dabe324 100644
core.getPlugin().getLog().info("Handling player {}", username); core.getPlugin().getLog().info("Handling player {}", username);
@@ -130,7 +133,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> { @@ -130,7 +133,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
//end of Govindas comment //end of Govindas comment
<<<<<<< HEAD
// LimeLogin end // LimeLogin end
=======
// LimeLogin end
>>>>>>> 654e137 (related to main)
- if (core.getConfig().get("autoRegister", false) && (authHook == null)) { - if (core.getConfig().get("autoRegister", false) && (authHook == null)) {
+ if (core.getConfig().get("autoRegister", false)) { + if (core.getConfig().get("autoRegister", false)) {
// LimeLogin start // LimeLogin start
requestPremiumLogin(source, profile, username, false); //Comment: always use false to fix an error XD requestPremiumLogin(source, profile, username, false); //Comment: always use false to fix an error XD
// LimeLogin end // LimeLogin end
<<<<<<< HEAD
=======
>>>>>>> 654e137 (related to main)
-- --
2.32.0.windows.1 2.32.0.windows.1