CPU
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/1.16' of https://github.com/GeyserMC/Geyser into feature/1.16

This commit is contained in:
DoctorMacc 2020-06-24 11:14:27 -04:00
parent 78df56c7a0 ca7484a5cf
commit 2b874b4f24
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/bungeecord/pom.xml
View File

@ -65,6 +65,10 @@
<pattern>io.netty</pattern> <pattern>io.netty</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern> <shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.reflections.reflections</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>

6
bootstrap/spigot/pom.xml
View File

@ -73,7 +73,11 @@
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml.jackson</pattern> <pattern>com.fasterxml.jackson</pattern>
<shadedPattern>org.geysermc.platform.bukkit.shaded.jackson</shadedPattern> <shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>org.reflections.reflections</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>

4
bootstrap/sponge/pom.xml
View File

@ -69,6 +69,10 @@
<pattern>it.unimi.dsi.fastutil</pattern> <pattern>it.unimi.dsi.fastutil</pattern>
<shadedPattern>org.geysermc.platform.sponge.shaded.fastutil</shadedPattern> <shadedPattern>org.geysermc.platform.sponge.shaded.fastutil</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.reflections.reflections</pattern>
<shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>

4
bootstrap/velocity/pom.xml
View File

@ -61,6 +61,10 @@
<pattern>it.unimi.dsi.fastutil</pattern> <pattern>it.unimi.dsi.fastutil</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern> <shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.reflections.reflections</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>