Work on server patches

This commit is contained in:
Shane Freeder
2019-12-11 00:56:03 +00:00
parent f181496be3
commit 0d64f85acc
42 changed files with 326 additions and 339 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 0f8bccd430..04b0dd9a7f 100644
index 5243c0321..ae1de6d01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -16,7 +16,7 @@ index 0f8bccd430..04b0dd9a7f 100644
- <artifactId>spigot</artifactId>
+ <artifactId>paper</artifactId>
<packaging>jar</packaging>
<version>1.14.4-R0.1-SNAPSHOT</version>
<version>1.15-R0.1-SNAPSHOT</version>
- <name>Spigot</name>
- <url>https://www.spigotmc.org/</url>
+ <name>Paper</name>
@@ -27,7 +27,7 @@ index 0f8bccd430..04b0dd9a7f 100644
+ <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<minecraft.version>1.14.4</minecraft.version>
<minecraft.version>1.15</minecraft.version>
@@ -0,0 +0,0 @@
</properties>
@@ -137,7 +137,7 @@ index 0f8bccd430..04b0dd9a7f 100644
@@ -0,0 +0,0 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
@@ -146,7 +146,7 @@ index 0f8bccd430..04b0dd9a7f 100644
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d0..674096cab1 100644
index 93046379d..674096cab 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -0,0 +0,0 @@ public final class Versioning {