Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Revert all 1.14.60-specific changes

Browse source
This commit is contained in:
DoctorMacc 2020-07-06 21:42:12 -04:00
parent 4c74f82c19
commit 4353c184d9
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/bukkit/pom.xml
View file

@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>us.myles</groupId> <groupId>us.myles</groupId>
<artifactId>viaversion</artifactId> <artifactId>viaversion</artifactId>
<version>3.0.1</version> <version>3.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java
View file

@ -110,8 +110,8 @@ public class GeyserBukkitPlugin extends JavaPlugin implements GeyserBootstrap {
if (Bukkit.getPluginManager().getPlugin("ViaVersion") != null) { if (Bukkit.getPluginManager().getPlugin("ViaVersion") != null) {
// TODO: Update when ViaVersion updates // TODO: Update when ViaVersion updates
// API changes between 2.2.3 and 3.0.0-SNAPSHOT require this check // API changes between 2.2.3 and 3.0.0-SNAPSHOT require this check
if (Via.getAPI().getVersion().contains("2.2.3") && isLegacy) { if (!Via.getAPI().getVersion().equals("3.0.0-SNAPSHOT") && isLegacy) {
geyserLogger.info("ViaVersion detected but not the newest version of ViaVersion. Please update your ViaVersion plugin for compatibility with Geyser."); geyserLogger.info("ViaVersion detected but not ViaVersion-ABSTRACTION. Please update your ViaVersion plugin for compatibility with Geyser.");
} else { } else {
isViaVersion = true; isViaVersion = true;
} }

1
connector/src/main/java/org/geysermc/connector/GeyserConnector.java
View file

@ -110,7 +110,6 @@ public class GeyserConnector {
logger.info("Loading " + NAME + " version " + VERSION); logger.info("Loading " + NAME + " version " + VERSION);
logger.info(""); logger.info("");
logger.info("******************************************"); logger.info("******************************************");
logger.warning("This build is for connecting to Java 1.15.2 servers and from Bedrock 1.14.60 clients. Please join our Discord (https://discord.geysermc.org) for up-to-date information about where to download 1.16.");
this.generalThreadPool = Executors.newScheduledThreadPool(config.getGeneralThreadPool()); this.generalThreadPool = Executors.newScheduledThreadPool(config.getGeneralThreadPool());