SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc checkstyle fixes

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-04-14 12:34:43 +10:00
parent 5833b4d35c
commit 18886036f4
72 changed files with 149 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@@ -29,6 +29,7 @@ import org.objectweb.asm.Type;
*
* @author md_5
*/
// CHECKSTYLE:OFF
public class Commodore
{

15
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -37,7 +37,7 @@ public final class CraftChatMessage {
return ChatColor.getByChar(format.character);
}
private static class StringMessage {
private static final class StringMessage {
private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE);
private final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
@@ -47,10 +47,10 @@ public final class CraftChatMessage {
private int currentIndex;
private final String message;
private StringMessage(String message, boolean keepNewlines) {
private StringMessage(String message, boolean keepNewlines) {
this.message = message;
if (message == null) {
output = new IChatBaseComponent[] { currentChatComponent };
output = new IChatBaseComponent[]{currentChatComponent};
return;
}
list.add(currentChatComponent);
@@ -100,7 +100,7 @@ public final class CraftChatMessage {
}
break;
case 3:
if ( !( match.startsWith( "http://" ) || match.startsWith( "https://" ) ) ) {
if (!(match.startsWith("http://") || match.startsWith("https://"))) {
match = "http://" + match;
}
modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
@@ -207,8 +207,7 @@ public final class CraftChatMessage {
if (matcher.reset(msg).find()) {
matcher.reset();
ChatModifier modifier = text.getChatModifier() != null ?
text.getChatModifier() : new ChatModifier();
ChatModifier modifier = text.getChatModifier() != null ? text.getChatModifier() : new ChatModifier();
List<IChatBaseComponent> extras = new ArrayList<IChatBaseComponent>();
List<IChatBaseComponent> extrasOld = new ArrayList<IChatBaseComponent>(text.getSiblings());
component = text = new ChatComponentText("");
@@ -217,7 +216,7 @@ public final class CraftChatMessage {
while (matcher.find()) {
String match = matcher.group();
if ( !( match.startsWith( "http://" ) || match.startsWith( "https://" ) ) ) {
if (!(match.startsWith("http://") || match.startsWith("https://"))) {
match = "http://" + match;
}
@@ -262,7 +261,7 @@ public final class CraftChatMessage {
if (c.getChatModifier() != null && c.getChatModifier().getClickEvent() == null) {
subs[i] = fixComponent(c, matcher);
}
} else if (comp instanceof String && matcher.reset((String)comp).find()) {
} else if (comp instanceof String && matcher.reset((String) comp).find()) {
subs[i] = fixComponent(new ChatComponentText((String) comp), matcher);
}
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftRayTraceResult.java
View File

@@ -14,7 +14,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
public class CraftRayTraceResult {
public final class CraftRayTraceResult {
private CraftRayTraceResult() {}

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java
View File

@@ -73,7 +73,7 @@ public abstract class LazyHashSet<E> implements Set<E> {
}
public Set<E> getReference() {
Set<E> reference = this.reference ;
Set<E> reference = this.reference;
if (reference != null) {
return reference;
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
View File

@@ -39,7 +39,7 @@ public final class WeakCollection<T> implements Collection<T> {
@Override
public boolean contains(Object object) {
if (object == null) {
if (object == null) {
return false;
}
for (T compare : this) {

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
View File

@@ -4,7 +4,7 @@ import org.bukkit.permissions.Permission;
import org.bukkit.util.permissions.DefaultPermissions;
public final class CraftDefaultPermissions {
private static final String ROOT= "minecraft";
private static final String ROOT = "minecraft";
private CraftDefaultPermissions() {}