twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 07:32:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Assorted whitespace fixes

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2017-08-06 09:08:05 +10:00
parent da073e8e66
commit e3d4acc303
50 changed files with 96 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
paper-api/pom.xml
View File

@@ -54,7 +54,6 @@
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
<version>1.1.1</version> <version>1.1.1</version>
<type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- bundled with Minecraft, should be kept in sync --> <!-- bundled with Minecraft, should be kept in sync -->

1
paper-api/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
View File

@@ -3,7 +3,6 @@ package org.bukkit.configuration.file;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.Reader; import java.io.Reader;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;

7
paper-api/src/main/java/org/bukkit/conversations/ConversationFactory.java
View File

@@ -35,8 +35,7 @@ public class ConversationFactory {
* *
* @param plugin The plugin that owns the factory. * @param plugin The plugin that owns the factory.
*/ */
public ConversationFactory(Plugin plugin) public ConversationFactory(Plugin plugin) {
{
this.plugin = plugin; this.plugin = plugin;
isModal = true; isModal = true;
localEchoEnabled = true; localEchoEnabled = true;
@@ -58,8 +57,7 @@ public class ConversationFactory {
* @param modal The modality of all conversations to be created. * @param modal The modality of all conversations to be created.
* @return This object. * @return This object.
*/ */
public ConversationFactory withModality(boolean modal) public ConversationFactory withModality(boolean modal) {
{
isModal = modal; isModal = modal;
return this; return this;
} }
@@ -141,7 +139,6 @@ public class ConversationFactory {
return withConversationCanceller(new ExactMatchConversationCanceller(escapeSequence)); return withConversationCanceller(new ExactMatchConversationCanceller(escapeSequence));
} }
/** /**
* Adds a {@link ConversationCanceller} to constructed conversations. * Adds a {@link ConversationCanceller} to constructed conversations.
* *

1
paper-api/src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java
View File

@@ -1,6 +1,5 @@
package org.bukkit.conversations; package org.bukkit.conversations;
import org.bukkit.Server;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
/** /**

2
paper-api/src/main/java/org/bukkit/conversations/NullConversationPrefix.java
View File

@@ -1,7 +1,5 @@
package org.bukkit.conversations; package org.bukkit.conversations;
import org.bukkit.command.CommandSender;
/** /**
* NullConversationPrefix is a {@link ConversationPrefix} implementation that * NullConversationPrefix is a {@link ConversationPrefix} implementation that
* displays nothing in front of conversation output. * displays nothing in front of conversation output.

3
paper-api/src/main/java/org/bukkit/conversations/NumericPrompt.java
View File

@@ -30,8 +30,7 @@ public abstract class NumericPrompt extends ValidatingPrompt{
@Override @Override
protected Prompt acceptValidatedInput(ConversationContext context, String input) { protected Prompt acceptValidatedInput(ConversationContext context, String input) {
try try {
{
return acceptValidatedInput(context, NumberUtils.createNumber(input)); return acceptValidatedInput(context, NumberUtils.createNumber(input));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return acceptValidatedInput(context, NumberUtils.INTEGER_ZERO); return acceptValidatedInput(context, NumberUtils.INTEGER_ZERO);

1
paper-api/src/main/java/org/bukkit/conversations/PlayerNamePrompt.java
View File

@@ -18,7 +18,6 @@ public abstract class PlayerNamePrompt extends ValidatingPrompt{
@Override @Override
protected boolean isInputValid(ConversationContext context, String input) { protected boolean isInputValid(ConversationContext context, String input) {
return plugin.getServer().getPlayer(input) != null; return plugin.getServer().getPlayer(input) != null;
} }
@Override @Override

3
paper-api/src/main/java/org/bukkit/material/Mushroom.java
View File

@@ -237,8 +237,7 @@ public class Mushroom extends MaterialData {
case DOWN: case DOWN:
if (painted) { if (painted) {
data = MushroomBlockTexture.ALL_CAP.getData(); data = MushroomBlockTexture.ALL_CAP.getData();
} } else {
else {
data = MushroomBlockTexture.ALL_PORES.getData(); data = MushroomBlockTexture.ALL_PORES.getData();
} }
break; break;