-
-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use loginevent #95
Open
ghost
wants to merge
10
commits into
Laarryy:master
Choose a base branch
from
unknown repository
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Use loginevent #95
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
acba4d0
Allow use of waterfall's LoginEvent for uuid
89a6ce8
Message in console
bb1c2c3
Full WaterFall LoginEvent support
1e39d73
Config
6b01014
more config changes
cda7da0
VPN deny message
8f184ef
oops
c62b351
Fix ipinfo
bb9f4f0
loginevent is in bungeecord
de960f5
fix message
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
Bungee/src/main/java/me/egg82/antivpn/utils/LoginEventWrapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package me.egg82.antivpn.utils; | ||
|
|
||
| import net.md_5.bungee.api.chat.BaseComponent; | ||
| import net.md_5.bungee.api.connection.PendingConnection; | ||
| import net.md_5.bungee.api.connection.ProxiedPlayer; | ||
| import net.md_5.bungee.api.event.LoginEvent; | ||
| import net.md_5.bungee.api.event.PostLoginEvent; | ||
| import net.md_5.bungee.api.event.PreLoginEvent; | ||
| import net.md_5.bungee.api.plugin.Plugin; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.net.InetSocketAddress; | ||
| import java.util.UUID; | ||
|
|
||
| public class LoginEventWrapper { | ||
| private PreLoginEvent preLoginEvent = null; | ||
| private PostLoginEvent postLoginEvent = null; | ||
| private LoginEvent loginEvent = null; | ||
| private Plugin plugin; | ||
|
|
||
| public LoginEventWrapper(Object event,Plugin plugin) { | ||
| if (event instanceof PreLoginEvent) { | ||
| preLoginEvent = (PreLoginEvent) event; | ||
| }else if (event instanceof PostLoginEvent) { | ||
| postLoginEvent = (PostLoginEvent) event; | ||
| } else { | ||
| loginEvent = (LoginEvent) event; | ||
| } | ||
| this.plugin = plugin; | ||
| } | ||
|
|
||
| public InetSocketAddress getAddress() { | ||
| if (preLoginEvent != null) { | ||
| return preLoginEvent.getConnection().getAddress(); | ||
| } else if (postLoginEvent != null) { | ||
| return postLoginEvent.getPlayer().getAddress(); | ||
| } else { | ||
| return loginEvent.getConnection().getAddress(); | ||
| } | ||
| } | ||
| public void disconnect(String ip,boolean mcLeaks,BaseComponent... message){ | ||
| if (preLoginEvent != null) { | ||
| preLoginEvent.setCancelled(true); | ||
| preLoginEvent.setCancelReason(message); | ||
| } else if (postLoginEvent != null) { | ||
| postLoginEvent.getPlayer().disconnect(message); | ||
| } else { | ||
| loginEvent.setCancelled(true); | ||
| loginEvent.setCancelReason(message); | ||
| } | ||
| plugin.getLogger().info("Disconnecting " + getConnection().getName() + " for using a" + (mcLeaks ? "n MCLeaks account" : " VPN") + ". Address: " + ip); | ||
| } | ||
|
|
||
| public UUID getUniqueId() { | ||
| if (preLoginEvent != null) { | ||
| throw new IllegalArgumentException("PreLoginEvent doesn't have method getUniqueID"); | ||
| } else if (postLoginEvent != null) { | ||
| return postLoginEvent.getPlayer().getUniqueId(); | ||
| } else { | ||
| return loginEvent.getConnection().getUniqueId(); | ||
| } | ||
| } | ||
|
|
||
| public String getName() { | ||
| if (preLoginEvent != null) { | ||
| return preLoginEvent.getConnection().getName(); | ||
| } else if (postLoginEvent != null) { | ||
| return postLoginEvent.getPlayer().getName(); | ||
| } else { | ||
| return loginEvent.getConnection().getName(); | ||
| } | ||
| } | ||
|
|
||
| @Nullable | ||
| public ProxiedPlayer getPlayer() { | ||
| if (preLoginEvent != null) { | ||
| return null; | ||
| } else if (postLoginEvent != null) { | ||
| return postLoginEvent.getPlayer(); | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| public void setCancelReason(BaseComponent... cancelReason) { | ||
| if (preLoginEvent != null) { | ||
| preLoginEvent.setCancelReason(cancelReason); | ||
| } else if (postLoginEvent != null) { | ||
| throw new IllegalArgumentException("PostLoginEvent doesn't have method setCancelReason"); | ||
| } else { | ||
| loginEvent.setCancelReason(cancelReason); | ||
| } | ||
| } | ||
|
|
||
| public PendingConnection getConnection() { | ||
| if (preLoginEvent != null) { | ||
| return preLoginEvent.getConnection(); | ||
| } else if (postLoginEvent != null) { | ||
| throw new IllegalArgumentException("PostLoginEvent doesn't have method getConnection"); | ||
| } else { | ||
| return loginEvent.getConnection(); | ||
| } | ||
| } | ||
|
|
||
| public void setCancelled(boolean cancelled) { | ||
| if (preLoginEvent != null) { | ||
| preLoginEvent.setCancelled(true); | ||
| } else if (postLoginEvent != null) { | ||
| throw new IllegalArgumentException("PostLoginEvent doesn't have method setCancelReason"); | ||
| } else { | ||
| loginEvent.setCancelled(true); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why?