Upstream/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI.git synced 2024-11-16 07:35:32 +01:00
Code Issues Projects Releases Wiki Activity

Remove the @NotNull's because they are overridden by expansion devs anyways, and it turns out people can make them null anyways. This adds a hashcode check and pretty error for it.

Browse Source 
(cherry picked from commit f5386d4ca5)
This commit is contained in:
Starmism 2021-06-30 05:04:36 -06:00
parent 4c968f012d
commit 0c102a1823
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java
View File

@ -22,7 +22,6 @@ package me.clip.placeholderapi.expansion;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects;
import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.PlaceholderAPIPlugin;
import me.clip.placeholderapi.PlaceholderHook; import me.clip.placeholderapi.PlaceholderHook;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -46,7 +45,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
* *
* @return placeholder identifier that is associated with this expansion * @return placeholder identifier that is associated with this expansion
*/ */
@NotNull
public abstract String getIdentifier(); public abstract String getIdentifier();
/** /**
@ -54,7 +52,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
* *
* @return name of the author for this expansion * @return name of the author for this expansion
*/ */
@NotNull
public abstract String getAuthor(); public abstract String getAuthor();
/** /**
@ -62,7 +59,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
* *
* @return current version of this expansion * @return current version of this expansion
*/ */
@NotNull
public abstract String getVersion(); public abstract String getVersion();
/** /**
@ -70,7 +66,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
* *
* @return {@link #getIdentifier()} by default, name of this expansion if specified * @return {@link #getIdentifier()} by default, name of this expansion if specified
*/ */
@NotNull
public String getName() { public String getName() {
return getIdentifier(); return getIdentifier();
} }
@ -90,7 +85,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
* *
* @return placeholder list that this expansion provides * @return placeholder list that this expansion provides
*/ */
@NotNull
public List<String> getPlaceholders() { public List<String> getPlaceholders() {
return Collections.emptyList(); return Collections.emptyList();
} }
@ -369,4 +363,18 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
return null; return null;
} }
@Override
public int hashCode() {
if (this.getIdentifier() == null) {
throw new NullPointerException("Identifier must not be null! Error occurred in: " + this.getClass().getName());
}
if (this.getAuthor() == null) {
throw new NullPointerException("Author must not be null! Error occurred in: " + this.getClass().getName());
}
if (this.getVersion() == null) {
throw new NullPointerException("Version must not be null! Error occurred in: " + this.getClass().getName());
}
return super.hashCode();
}
} }