twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-09 08:32:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update our patches for the latest changes

Browse Source 
/ver is no longer useless! Meaninful version tracking yay!
This commit is contained in:
Zach Brown
2014-12-02 00:03:53 -06:00
parent 2bb64147b6
commit c78777957f
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/POM-changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 27 Nov 2014 21:07:38 -0800 Date: Tue, 2 Dec 2014 00:16:08 -0600
Subject: [PATCH] POM changes Subject: [PATCH] POM changes
@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- <name>Spigot-API</name> - <name>Spigot-API</name>
- <url>http://www.spigotmc.org</url> - <url>http://www.spigotmc.org</url>
+ <name>PaperSpigot-API</name> + <name>PaperSpigot-API</name>
+ <url>>https://github.com/PaperSpigot/Paper</url> + <url>https://github.com/PaperSpigot/Paper</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

24
Spigot-Server-Patches/POM-changes.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 27 Nov 2014 22:43:08 -0800 Date: Tue, 2 Dec 2014 00:35:01 -0600
Subject: [PATCH] POM changes Subject: [PATCH] POM changes
@@ -48,14 +48,30 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<artifactId>gitdescribe-maven-plugin</artifactId> </configuration>
<version>1.3</version> <executions>
<execution>
- <id>ex-spigot</id>
+ <id>ex-paperspigot</id>
<configuration> <configuration>
- <outputPrefix>git-Spigot-</outputPrefix> - <outputPrefix>git-Spigot-</outputPrefix>
+ <outputPrefix>git-PaperSpigot-</outputPrefix> + <outputPrefix>git-PaperSpigot-</outputPrefix>
<outputPostfix></outputPostfix> <outputPostfix></outputPostfix>
<scmDirectory>../</scmDirectory>
- <descriptionProperty>spigot.desc</descriptionProperty>
+ <descriptionProperty>paperspigot.desc</descriptionProperty>
</configuration> </configuration>
<executions> <phase>compile</phase>
<goals>
@@ -0,0 +0,0 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>
- <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
+ <Implementation-Version>${paperspigot.desc}${craftbukkit.desc}</Implementation-Version>
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java