related to main
This commit is contained in:
parent
f5ad62856c
commit
8753b355e8
@ -34,7 +34,7 @@ index e26b271..25f1ac2 100644
|
||||
- registerHook();
|
||||
+ // LimeLogin start
|
||||
+ //registerHook();
|
||||
+ // LimeLogin stop
|
||||
+ // LimeLogin end
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -57,9 +57,14 @@ index e26b271..25f1ac2 100644
|
||||
} catch (ReflectiveOperationException ex) {
|
||||
logger.error("Couldn't load the auth hook class", ex);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
+ }
|
||||
|
||||
=======
|
||||
- }
|
||||
+ } */
|
||||
>>>>>>> 654e137 (related to main)
|
||||
+ // LimeLogin end
|
||||
|
||||
public void sendPluginMessage(Server server, ChannelMessage message) {
|
||||
|
@ -65,7 +65,10 @@ index 410b1e4..0136f09 100644
|
||||
+ // LimeLogin start
|
||||
+ super(plugin.getCore());
|
||||
+ // LimeLogin end
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 654e137 (related to main)
|
||||
this.plugin = plugin;
|
||||
this.preLoginEvent = preLoginEvent;
|
||||
this.connection = connection;
|
||||
@ -310,7 +313,10 @@ index ec3f924..90c9add 100644
|
||||
+ // LimeLogin start
|
||||
+ //private AuthPlugin<P> authPlugin;
|
||||
+ // LimeLogin end
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 654e137 (related to main)
|
||||
public FastLoginCore(T plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
@ -325,8 +331,11 @@ index ec3f924..90c9add 100644
|
||||
}
|
||||
+ */
|
||||
+ // LimeLogin end
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> 654e137 (related to main)
|
||||
|
||||
public RateLimiter getRateLimiter() {
|
||||
return rateLimiter;
|
||||
@ -520,7 +529,10 @@ index 5490673..dabe324 100644
|
||||
- this.authHook = authHook;
|
||||
this.floodgateHook = new FloodgateHook<>(core);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 654e137 (related to main)
|
||||
+ // LimeLogin end
|
||||
+
|
||||
|
||||
@ -528,15 +540,23 @@ index 5490673..dabe324 100644
|
||||
core.getPlugin().getLog().info("Handling player {}", username);
|
||||
@@ -130,7 +133,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
|
||||
//end of Govindas comment
|
||||
<<<<<<< HEAD
|
||||
|
||||
// LimeLogin end
|
||||
|
||||
=======
|
||||
|
||||
// LimeLogin end
|
||||
>>>>>>> 654e137 (related to main)
|
||||
- if (core.getConfig().get("autoRegister", false) && (authHook == null)) {
|
||||
+ if (core.getConfig().get("autoRegister", false)) {
|
||||
// LimeLogin start
|
||||
requestPremiumLogin(source, profile, username, false); //Comment: always use false to fix an error XD
|
||||
// LimeLogin end
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 654e137 (related to main)
|
||||
--
|
||||
2.32.0.windows.1
|
||||
|
||||
|
Reference in New Issue
Block a user