Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-01-10 09:57:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix gson dependency

Browse Source
This commit is contained in:
Gabriele C 2018-10-23 16:56:49 +02:00
parent d2373ed73f
commit 3e1d217973
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@ -459,6 +459,32 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>27.0-jre</version> <version>27.0-jre</version>
<optional>true</optional> <optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency --> <!-- MaxMind GEO IP with our modifications to use GSON in replacement of the big Jackson dependency -->

6
src/main/java/fr/xephi/authme/events/EmailChangedEvent.java
View File

@ -5,8 +5,6 @@ import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import javax.annotation.Nullable;
/** /**
* This event is called when a player adds or changes his email address. * This event is called when a player adds or changes his email address.
*/ */
@ -26,7 +24,7 @@ public class EmailChangedEvent extends CustomEvent implements Cancellable {
* the email is trying to set. * the email is trying to set.
* @param isAsync should this event be called asynchronously? * @param isAsync should this event be called asynchronously?
*/ */
public EmailChangedEvent(Player player, @Nullable String oldEmail, String newEmail, boolean isAsync) { public EmailChangedEvent(Player player, String oldEmail, String newEmail, boolean isAsync) {
super(isAsync); super(isAsync);
this.player = player; this.player = player;
this.oldEmail = oldEmail; this.oldEmail = oldEmail;
@ -52,7 +50,7 @@ public class EmailChangedEvent extends CustomEvent implements Cancellable {
* *
* @return old email stored on file. Can be null when user never had an email and adds a new one. * @return old email stored on file. Can be null when user never had an email and adds a new one.
*/ */
public @Nullable String getOldEmail() { public String getOldEmail() {
return this.oldEmail; return this.oldEmail;
} }