1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-22 08:19:20 +00:00

Merge remote-tracking branch 'origin/master' into server-language-processing

This commit is contained in:
rtm516
2020-04-09 13:58:45 +01:00
21 changed files with 569 additions and 45 deletions

View File

@@ -54,7 +54,6 @@
<shadedPattern>org.geysermc.platform.bukkit.shaded.fastutil</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>

View File

@@ -54,7 +54,6 @@
<shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>

View File

@@ -58,7 +58,6 @@
<shadedPattern>org.geysermc.platform.sponge.shaded.fastutil</shadedPattern>
</relocation>
</relocations>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>

View File

@@ -52,7 +52,7 @@ public class GeyserLogger extends SimpleTerminalConsole implements IGeyserLogger
@Override
protected void shutdown() {
GeyserConnector.getInstance().shutdown();
GeyserConnector.getInstance().getBootstrap().onDisable();
}
@Override

View File

@@ -44,7 +44,12 @@
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<relocations>
<relocation>
<pattern>it.unimi.dsi.fastutil</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>