Skip to content

Commit bacd008

Browse files
authored
Merge pull request #49 from SpigotMC/master
[pull] master from SpigotMC:master
2 parents 38b5611 + 8e99a4c commit bacd008

File tree

13 files changed

+37
-26
lines changed

13 files changed

+37
-26
lines changed

api/src/main/java/net/md_5/bungee/api/connection/Connection.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ interface Unsafe
8787

8888
/**
8989
* Queue a packet to this connection.
90-
* If the packet is not registered for the connections current encoder protocol, it will be queued until it is,
91-
* otherwise it will be sent immediately.
90+
*
91+
* If the packet is not registered for the connections current encoder
92+
* protocol, it will be queued until it is, otherwise it will be sent
93+
* immediately.
9294
*
9395
* @param packet the packet to be queued
9496
* @throws UnsupportedOperationException if used for a PendingConnection

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ public enum MainHand
386386

387387
/**
388388
* Gets the client brand of this player.
389+
*
389390
* If the player has not sent a brand packet yet, it will return null.
390391
*
391392
* @return the brand of the client, or null if not received yet

api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,7 @@ public void registerListener(Plugin plugin, Listener listener)
474474
{
475475
for ( Method method : listener.getClass().getDeclaredMethods() )
476476
{
477-
Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ),
478-
"Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
477+
Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ), "Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
479478
}
480479
eventBus.register( listener );
481480
listenersByPlugin.put( plugin, listener );

chat/src/main/java/net/md_5/bungee/api/chat/BaseComponent.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,9 @@ public void setShadowColor(Color color)
313313
}
314314

315315
/**
316-
* Returns the shadow color of this component. This uses the parent's shadow color if this
317-
* component doesn't have one. null is returned if no shadow color is found.
316+
* Returns the shadow color of this component. This uses the parent's shadow
317+
* color if this component doesn't have one. null is returned if no shadow
318+
* color is found.
318319
*
319320
* @return the shadow color of this component
320321
*/

dialog/src/main/java/net/md_5/bungee/api/dialog/DialogListDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public final class DialogListDialog implements Dialog
3838
*/
3939
private Integer columns;
4040
/**
41-
* The width of the dialog buttons (default: 150, minimum: 1, maximum: 1024).
41+
* The width of the dialog buttons (default: 150, minimum: 1, maximum:
42+
* 1024).
4243
*/
4344
@SerializedName("button_width")
4445
private Integer buttonWidth;

dialog/src/main/java/net/md_5/bungee/api/dialog/ServerLinksDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public final class ServerLinksDialog implements Dialog
3737
*/
3838
private Integer columns;
3939
/**
40-
* The width of the dialog buttons (default: 150, minimum: 1, maximum: 1024).
40+
* The width of the dialog buttons (default: 150, minimum: 1, maximum:
41+
* 1024).
4142
*/
4243
@SerializedName("button_width")
4344
private Integer buttonWidth;

dialog/src/main/java/net/md_5/bungee/api/dialog/action/RunCommandAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import lombok.experimental.Accessors;
77

88
/**
9-
* Executes a command. If the command requires a permission
10-
* higher than 0, a confirmation dialog will be shown by the client.
9+
* Executes a command. If the command requires a permission higher than 0, a
10+
* confirmation dialog will be shown by the client.
1111
*/
1212
@Data
1313
@Accessors(fluent = true)

nbt/src/main/java/net/md_5/bungee/nbt/Tag.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ public interface Tag
8181
void write(DataOutput output) throws IOException;
8282

8383
/**
84-
* Reads a {@link Tag} from the given {@link DataInput},
85-
* based on the specified tag type, with limitations of the
86-
* {@link NBTLimiter}.
84+
* Reads a {@link Tag} from the given {@link DataInput}, based on the
85+
* specified tag type, with limitations of the {@link NBTLimiter}.
8786
*
8887
* @param id the nbt type
8988
* @param input the input to read from
@@ -104,8 +103,8 @@ static TypedTag readById(byte id, DataInput input, NBTLimiter limiter) throws IO
104103
}
105104

106105
/**
107-
* Reads a {@link NamedTag} from the given {@link DataInput},
108-
* with limitations of the {@link NBTLimiter}.
106+
* Reads a {@link NamedTag} from the given {@link DataInput}, with
107+
* limitations of the {@link NBTLimiter}.
109108
*
110109
* @param input the data input to read from
111110
* @param limiter the limiter for this read operation
@@ -120,8 +119,8 @@ static NamedTag readNamedTag(DataInput input, NBTLimiter limiter) throws IOExcep
120119
}
121120

122121
/**
123-
* Serializes the given {@link TypedTag} into a byte array.
124-
* This is the inverse operation of {@link #fromByteArray(byte[])}.
122+
* Serializes the given {@link TypedTag} into a byte array. This is the
123+
* inverse operation of {@link #fromByteArray(byte[])}.
125124
*
126125
* @param tag the tag to convert
127126
* @return the serialized byte array
@@ -137,8 +136,8 @@ static byte[] toByteArray(TypedTag tag) throws IOException
137136
}
138137

139138
/**
140-
* Deserializes the given byte array into a {@link TypedTag}.
141-
* This is the inverse operation of {@link #toByteArray(TypedTag)}.
139+
* Deserializes the given byte array into a {@link TypedTag}. This is the
140+
* inverse operation of {@link #toByteArray(TypedTag)}.
142141
*
143142
* @param data the byte array to read from
144143
* @return the deserialized {@link TypedTag}
@@ -150,8 +149,8 @@ static TypedTag fromByteArray(byte[] data) throws IOException
150149
}
151150

152151
/**
153-
* Deserializes the given byte array into a {@link TypedTag},
154-
* with limitations of the {@link NBTLimiter}.
152+
* Deserializes the given byte array into a {@link TypedTag}, with
153+
* limitations of the {@link NBTLimiter}.
155154
*
156155
* @param data the byte array to read from
157156
* @param limiter the limiter for this read operation

protocol/src/main/java/net/md_5/bungee/protocol/channel/BungeeChannelInitializer.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
import lombok.NoArgsConstructor;
88

99
/**
10-
* This class hold a netty channel initializer that calls the given {@link ChannelAcceptor}.
11-
* Use {@link BungeeChannelInitializer#create(ChannelAcceptor)} to create a new instance.
10+
* This class hold a netty channel initializer that calls the given
11+
* {@link ChannelAcceptor}.
12+
*
13+
* Use {@link BungeeChannelInitializer#create(ChannelAcceptor)} to create a new
14+
* instance.
1215
* <p>
1316
* Please note that this API is unsafe and doesn't provide any guarantees about
1417
* the stability of the channel pipeline or the API itself. Use at your own

proxy/src/main/java/net/md_5/bungee/netty/LengthPrependerAndCompressor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
/**
1414
* prepends length of message and optionally compresses message beforehand
1515
* <br>
16-
* combining these operations allows to keep space infront of compressed data for length varint
16+
* combining these operations allows to keep space infront of compressed data
17+
* for length varint
1718
*/
1819
public class LengthPrependerAndCompressor extends MessageToMessageEncoder<ByteBuf>
1920
{
21+
2022
// reasonable to not support length varints > 4 byte (268435455 byte > 268MB)
2123
// if ever changed to smaller than 4, also change varintSize method to check for that
2224
private static final byte MAX_SUPPORTED_VARINT_LENGTH_LEN = 4;

0 commit comments

Comments
 (0)