Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Myles 2017-05-22 13:38:37 +01:00
parent 7d001c61a8 ce286cf322
commit 6d0b28fac4
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java
View File

@ -37,8 +37,7 @@ public class BukkitViaInjector implements ViaInjector {
// Inject the list
List wrapper = new ListWrapper((List) value) {
@Override
public synchronized void handleAdd(Object o) {
synchronized (this) {
public void handleAdd(Object o) {
if (o instanceof ChannelFuture) {
try {
injectChannelFuture((ChannelFuture) o);
@ -47,7 +46,6 @@ public class BukkitViaInjector implements ViaInjector {
}
}
}
}
};
injectedLists.add(new Pair<>(field, connection));
field.set(connection, wrapper);

4
sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java
View File

@ -36,8 +36,7 @@ public class SpongeViaInjector implements ViaInjector {
// Inject the list
List wrapper = new ListWrapper((List) value) {
@Override
public synchronized void handleAdd(Object o) {
synchronized (this) {
public void handleAdd(Object o) {
if (o instanceof ChannelFuture) {
try {
injectChannelFuture((ChannelFuture) o);
@ -46,7 +45,6 @@ public class SpongeViaInjector implements ViaInjector {
}
}
}
}
};
injectedLists.add(new Pair<>(field, connection));
field.set(connection, wrapper);