Merge branch 'master' into gh-pages

ProtocolLib/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.comphenix.protocol</groupId>
   <artifactId>ProtocolLib</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>Provides read/write access to the Minecraft protocol.</description>
   

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java

@@ -99,7 +99,6 @@ public abstract class PacketAdapter implements PacketListener {
 	 * Initialize a packet listener for a single connection side.
 	 * @param plugin - the plugin that spawned this listener.
 	 * @param connectionSide - the packet type the listener is looking for.
-	 * @param listenerPriority - the event priority.
 	 * @param gamePhase - which game phase this listener is active under.
 	 * @param packets - the packet IDs the listener is looking for.
 	 */

ProtocolLib/src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java

@@ -50,7 +50,6 @@ public interface ListenerInvoker {
 	/**
 	 * Associate a given class with the given packet ID. Internal method.
 	 * @param clazz - class to associate.
-	 * @param packetID - the packet ID.
 	 */
 	public abstract void unregisterPacketClass(Class<?> clazz);
 

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java

@@ -442,7 +442,6 @@ public class PlayerInjectionHandler {
 	 * the method will try a workaround to remove the injected hook in the NetServerHandler.
 	 * 
 	 * @param address - address of the player to unregister.
-	 * @param serverHandler - whether or not the net server handler has already been created.
 	 * @return TRUE if a player has been uninjected, FALSE otherwise.
 	 */
 	public boolean uninjectPlayer(InetSocketAddress address) {

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java

@@ -35,7 +35,6 @@ public class PrettyPrinter {
 	 * Print the content of an object.
 	 * @param object - the object to serialize.
 	 * @param stop - superclass that will stop the process.
-	 * @param depth - how far in the hierachy until we stop.
 	 * @return String representation of the class.
 	 * @throws IllegalAccessException 
 	 */

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java

@@ -87,7 +87,7 @@ public class StructureModifier<TField> {
 	 * @param targetType - the structure to modify.
 	 * @param superclassExclude - a superclass to exclude.
 	 * @param requireDefault - whether or not we will be using writeDefaults().
-	 * @param useStructureModifier - whether or not to automatically compile this structure modifier.
+	 * @param useStructureCompiler - whether or not to automatically compile this structure modifier.
 	 */
 	public StructureModifier(Class targetType, Class superclassExclude, boolean requireDefault, boolean useStructureCompiler) {
 		List<Field> fields = getFields(targetType, superclassExclude);
@@ -137,7 +137,7 @@ public class StructureModifier<TField> {
 	 * @param defaultFields - list of fields that will be automatically initialized.
 	 * @param converter - converts between the common field type and the actual type the consumer expects.
 	 * @param subTypeCache - a structure modifier cache.
-	 * @param useStructureModifier - whether or not to automatically compile this structure modifier.
+	 * @param useStructureCompiler - whether or not to automatically compile this structure modifier.
 	 */
 	protected void initialize(Class targetType, Class fieldType, 
 			  List<Field> data, Map<Field, Integer> defaultFields,

ProtocolLib/src/main/java/com/comphenix/protocol/utility/ChatExtensions.java

@@ -30,7 +30,6 @@ public class ChatExtensions {
 	 * Send a message without invoking the packet listeners.
 	 * @param receiver - the receiver.
 	 * @param message - the message to send.
-	 * @return TRUE if the message was sent successfully, FALSE otherwise.
 	 * @throws InvocationTargetException If we were unable to send the message.
 	 */
 	public void sendMessageSilently(CommandSender receiver, String message) throws InvocationTargetException { 

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java

@@ -73,7 +73,7 @@ public class WrappedDataWatcher {
 	
 	/**
 	 * Create a wrapper for a given data watcher.
-	 * @param dataWatcher - the data watcher to wrap.
+	 * @param handle - the data watcher to wrap.
 	 * @throws FieldAccessException If we're unable to wrap a DataWatcher.
 	 */
 	public WrappedDataWatcher(DataWatcher handle) {

ProtocolLib/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: ProtocolLib
-version: 1.6.0
+version: 1.6.1-SNAPSHOT
 description: Provides read/write access to the Minecraft protocol.
 author: Comphenix
 website: http://www.comphenix.net/ProtocolLib