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 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8a734a80e - Show all commits

14
FastLogin-Patches/0002-Added-old-commits-from-forked-repo-Fastlogin.patch
View File

@ -82,7 +82,7 @@ index 8a81b14..db8f269 100644
+ } + }
+ } + }
+ //end of Govindas code + //end of Govindas code
+ // LimeLogin stop + // LimeLogin end
} }
private void setOfflineId(InitialHandler connection, String username) { private void setOfflineId(InitialHandler connection, String username) {
@ -156,7 +156,7 @@ index 94500cb..b304559 100644
+ if (!playerProfile.getName().contains("-")) { playerProfile.setPremium(true); } + if (!playerProfile.getName().contains("-")) { playerProfile.setPremium(true); }
+ //end of Govindas code + //end of Govindas code
+ +
+ // LimeLogin stop + // LimeLogin end
playerProfile.getSaveLock().lock(); playerProfile.getSaveLock().lock();
try { try {
if (playerProfile.isSaved()) { if (playerProfile.isSaved()) {
@ -170,7 +170,7 @@ index 94500cb..b304559 100644
+ if (!playerProfile.getName().contains("-")) { playerProfile.setPremium(true); } + if (!playerProfile.getName().contains("-")) { playerProfile.setPremium(true); }
+ //end of Govindas code + //end of Govindas code
+ +
+ // LimeLogin stop + // LimeLogin end
try (PreparedStatement saveStmt = con.prepareStatement(INSERT_PROFILE, RETURN_GENERATED_KEYS)) { try (PreparedStatement saveStmt = con.prepareStatement(INSERT_PROFILE, RETURN_GENERATED_KEYS)) {
saveStmt.setString(1, uuid); saveStmt.setString(1, uuid);
@ -189,7 +189,7 @@ index 7efb157..b417e64 100644
+ //storage.save(playerProfile); + //storage.save(playerProfile);
+ //end of Govindas comment + //end of Govindas comment
+ +
+ // LimeLogin stop + // LimeLogin end
} }
} 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);
@ -240,11 +240,11 @@ index ec129a8..5490673 100644
+ //if (core.getConfig().get("autoRegister", false) && (authHook == null || !authHook.isRegistered(username))) { + //if (core.getConfig().get("autoRegister", false) && (authHook == null || !authHook.isRegistered(username))) {
+ //end of Govindas comment + //end of Govindas comment
+ +
+ // LimeLogin stop + // LimeLogin end
+ if (core.getConfig().get("autoRegister", false) && (authHook == null)) { + if (core.getConfig().get("autoRegister", false) && (authHook == null)) {
+ // 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 stop + // LimeLogin end
return true; return true;
} }
@ -289,7 +289,7 @@ index 0000000..007083e
+ this.cancelled = cancelled; + this.cancelled = cancelled;
+ } + }
+} +}
+// LimeLogin stop +// 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 ecb1c44..477c026 100644