diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 7efda2aaf..8830ff033 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,12 +1,11 @@
-### What version of ViaVersion are you using? Type /ver viaversion
+### What is the output link of /viaversion dump?
-### What version of Spigot are you using? Type /ver
-
-### What plugins are you using? Type /plugins
### Are you using any additional software like BungeeCord? If so, what software and version? (Please list your plugins as well)
+
### How does this error happen? login? Using an item?
+
### Is there an error in the console? Use pastebin.com. Is there a kick message?
diff --git a/README.md b/README.md
index 145263919..a68298dec 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ViaVersion 0.9.8
+# ViaVersion 0.9.9
[![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
[![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
diff --git a/pom.xml b/pom.xml
index 604ba0939..49cc3dbdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
jar
ViaVersion
- Allow 1.8 clients to join 1.9 bukkit servers!
+ Allow newer clients to join older server versions.
2016
https://www.spigotmc.org/resources/viaversion.19254/
diff --git a/src/main/java/us/myles/ViaVersion/Bungee.java b/src/main/java/us/myles/ViaVersion/Bungee.java
index eba8e8c79..e5f3f4758 100644
--- a/src/main/java/us/myles/ViaVersion/Bungee.java
+++ b/src/main/java/us/myles/ViaVersion/Bungee.java
@@ -9,7 +9,7 @@ public class Bungee extends Plugin {
@Override
public void onEnable() {
getLogger().severe(RED + "===============================================");
- getLogger().severe(RED + "ViaVersion is NOT a Bungeecord plugin");
+ getLogger().severe(RED + "ViaVersion is NOT a Bungeecord plugin.");
getLogger().severe(RED + "Install this plugin on all your spigot/bukkit");
getLogger().severe(RED + "servers and use the latest Bungeecord version");
getLogger().severe(RED + "to make ViaVersion work with BungeeCord.");
diff --git a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
index 2a8cd7d33..8471af2b2 100644
--- a/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
+++ b/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
@@ -7,8 +7,8 @@ import io.netty.channel.ChannelInitializer;
import io.netty.channel.socket.SocketChannel;
import lombok.Getter;
import lombok.NonNull;
-import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.plugin.java.JavaPlugin;
diff --git a/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java b/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java
index 845607ff3..fb3d77466 100644
--- a/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java
+++ b/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java
@@ -17,6 +17,7 @@ public interface ViaVersionAPI {
*
* @param player Bukkit player object
* @return True if the client is modified (At the moment it also means version 1.9 and higher)
+ * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(Player)}
*/
boolean isPorted(Player player);
@@ -42,7 +43,9 @@ public interface ViaVersionAPI {
*
* @param playerUUID UUID of a player
* @return True if the client is on 1.9
+ * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(UUID)}
*/
+ @Deprecated
boolean isPorted(UUID playerUUID);
/**
@@ -116,9 +119,9 @@ public interface ViaVersionAPI {
/**
* Get the supported protocol versions
* This method removes any blocked protocol versions.
- * @see ProtocolRegistry#getSupportedVersions() for full list.
*
* @return a list of protocol versions
+ * @see ProtocolRegistry#getSupportedVersions() for full list.
*/
SortedSet getSupportedVersions();
diff --git a/src/main/java/us/myles/ViaVersion/util/ListWrapper.java b/src/main/java/us/myles/ViaVersion/util/ListWrapper.java
index 95a59eae1..7b19c96cf 100644
--- a/src/main/java/us/myles/ViaVersion/util/ListWrapper.java
+++ b/src/main/java/us/myles/ViaVersion/util/ListWrapper.java
@@ -21,169 +21,123 @@ public abstract class ListWrapper implements List {
@Override
public synchronized int size() {
- synchronized (lock) {
- return this.list.size();
- }
+ return this.list.size();
}
@Override
public synchronized boolean isEmpty() {
- synchronized (lock) {
- return this.list.isEmpty();
- }
+ return this.list.isEmpty();
}
@Override
public synchronized boolean contains(Object o) {
- synchronized (lock) {
- return this.list.contains(o);
- }
+ return this.list.contains(o);
}
@Override
public synchronized Iterator iterator() {
- synchronized (lock) {
- return listIterator();
- }
+ return listIterator();
}
@Override
public synchronized Object[] toArray() {
- synchronized (lock) {
- return this.list.toArray();
- }
+ return this.list.toArray();
}
@Override
public synchronized boolean add(Object o) {
- synchronized (lock) {
- handleAdd(o);
- return this.list.add(o);
- }
+ handleAdd(o);
+ return this.list.add(o);
}
@Override
public synchronized boolean remove(Object o) {
- synchronized (lock) {
- return this.list.remove(o);
- }
+ return this.list.remove(o);
}
@Override
public synchronized boolean addAll(Collection c) {
- synchronized (lock) {
- for (Object o : c) {
- handleAdd(o);
- }
- return this.list.addAll(c);
+ for (Object o : c) {
+ handleAdd(o);
}
+ return this.list.addAll(c);
}
@Override
public synchronized boolean addAll(int index, Collection c) {
- synchronized (lock) {
- for (Object o : c) {
- handleAdd(o);
- }
- return this.list.addAll(index, c);
+ for (Object o : c) {
+ handleAdd(o);
}
+ return this.list.addAll(index, c);
}
@Override
public synchronized void clear() {
- synchronized (lock) {
- this.list.clear();
- }
+ this.list.clear();
}
@Override
public synchronized Object get(int index) {
- synchronized (lock) {
- return this.list.get(index);
- }
+ return this.list.get(index);
}
@Override
public synchronized Object set(int index, Object element) {
- synchronized (lock) {
- return this.list.set(index, element);
- }
+ return this.list.set(index, element);
}
@Override
public synchronized void add(int index, Object element) {
- synchronized (lock) {
- this.list.add(index, element);
- }
+ this.list.add(index, element);
}
@Override
public synchronized Object remove(int index) {
- synchronized (lock) {
- return this.list.remove(index);
- }
+ return this.list.remove(index);
}
@Override
public synchronized int indexOf(Object o) {
- synchronized (lock) {
- return this.list.indexOf(o);
- }
+ return this.list.indexOf(o);
}
@Override
public synchronized int lastIndexOf(Object o) {
- synchronized (lock) {
- return this.list.lastIndexOf(o);
- }
+ return this.list.lastIndexOf(o);
}
@Override
public synchronized ListIterator listIterator() {
- synchronized (lock) {
- return this.list.listIterator();
- }
+ return this.list.listIterator();
}
@Override
public synchronized ListIterator listIterator(int index) {
- synchronized (lock) {
- return this.list.listIterator(index);
- }
+ return this.list.listIterator(index);
}
@Override
public synchronized List subList(int fromIndex, int toIndex) {
- synchronized (lock) {
- return this.list.subList(fromIndex, toIndex);
- }
+ return this.list.subList(fromIndex, toIndex);
}
@Override
public synchronized boolean retainAll(Collection c) {
- synchronized (lock) {
- return this.list.retainAll(c);
- }
+ return this.list.retainAll(c);
}
@Override
public synchronized boolean removeAll(Collection c) {
- synchronized (lock) {
- return this.list.removeAll(c);
- }
+ return this.list.removeAll(c);
}
@Override
public synchronized boolean containsAll(Collection c) {
- synchronized (lock) {
- return this.list.containsAll(c);
- }
+ return this.list.containsAll(c);
}
@Override
public synchronized Object[] toArray(Object[] a) {
- synchronized (lock) {
- return this.list.toArray(a);
- }
+ return this.list.toArray(a);
}
}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index db08f322a..764d152a8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: ViaVersion
main: us.myles.ViaVersion.ViaVersionPlugin
-author: _MylesC
+authors: [_MylesC, Matsv]
version: ${project.version}
load: postworld
loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, SkinRestorer]