Skip to content

Commit 98a7b4d

Browse files
authored
Merge pull request #228 from FatSaw/ver/1.12.2
Some changes from other Paper forks
2 parents cfa99ef + 62aa216 commit 98a7b4d

File tree

10 files changed

+3523
-26
lines changed

10 files changed

+3523
-26
lines changed

sources/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@
283283
<filter>
284284
<artifact>org.spigotmc:minecraft-server:**</artifact>
285285
<excludes>
286+
<exclude>io/netty/**</exclude>
286287
<exclude>org/apache/logging/log4j/**</exclude>
287288
</excludes>
288289
</filter>
@@ -344,6 +345,12 @@
344345
<groupId>org.apache.maven.plugins</groupId>
345346
<artifactId>maven-compiler-plugin</artifactId>
346347
<version>3.7.0</version>
348+
<configuration>
349+
<excludes>
350+
<exclude>org/spigotmc/CaseInsensitiveHashingStrategy.java</exclude>
351+
<exclude>org/spigotmc/CaseInsensitiveMap.java</exclude>
352+
</excludes>
353+
</configuration>
347354
</plugin>
348355
<plugin>
349356
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)