3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-10-03 08:41:05 +02:00

Merge branch 'master' into dev

Dieser Commit ist enthalten in:
Myles 2017-05-22 13:38:37 +01:00
Commit 6d0b28fac4
2 geänderte Dateien mit 12 neuen und 16 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

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