Merge remote-tracking branch 'origin/master'

This commit is contained in:
EOT3000 2019-09-14 19:22:10 -04:00
commit 4c9636b041
3 changed files with 10 additions and 15 deletions

View file

@ -37,6 +37,7 @@ Links:
- [x] Entity support (Experimental) - [x] Entity support (Experimental)
- [ ] Chunks (Experimental) - [ ] Chunks (Experimental)
- [x] Block translation (may be missing mappings) - [x] Block translation (may be missing mappings)
- [ ] Block updates
- [ ] Block entities - [ ] Block entities
- [ ] Extra data - [ ] Extra data
- [ ] Biome colors - [ ] Biome colors

View file

@ -16,8 +16,8 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repository>
<repository> <repository>
<id>codemc-repo</id> <id>dosse-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url> <url>https://raw.github.com/JRakNet/WaifUPnP/master/</url>
</repository> </repository>
</repositories> </repositories>
@ -27,19 +27,13 @@
<artifactId>bungeecord-api</artifactId> <artifactId>bungeecord-api</artifactId>
<version>1.14-SNAPSHOT</version> <version>1.14-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>compile</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.14-SNAPSHOT</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.whirvis</groupId> <groupId>com.whirvis</groupId>
<artifactId>jraknet</artifactId> <artifactId>jraknet</artifactId>
<version>2.11.8</version> <version>2.11.8</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View file

@ -10,13 +10,13 @@ import net.md_5.bungee.api.plugin.Plugin;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.Proxy;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
public class GeyserPlugin extends Plugin { public class GeyserPlugin extends Plugin {
private List<ConnectedPlayer> players; private List<ConnectedPlayer> players;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void onEnable() { public void onEnable() {