Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-02 11:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Upstream merge.

Browse Source
This commit is contained in:
md_5 2015-01-05 14:32:01 +11:00
parent 436c6f2449
commit f2bf62789d
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Bukkit-Patches/0001-POM-Changes.patch
View File

@ -9,30 +9,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <version>9</version>
<modelVersion>4.0.0</modelVersion> </parent>
- <groupId>org.bukkit</groupId> - <groupId>org.bukkit</groupId>
- <artifactId>bukkit</artifactId> - <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId> + <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId> + <artifactId>spigot-api</artifactId>
<version>1.8-R0.1-SNAPSHOT</version> <version>1.8-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name> - <name>Bukkit</name>
- <url>http://www.bukkit.org</url> - <url>http://www.bukkit.org/</url>
- <description>A plugin API for Minecraft servers.</description>
+ <name>Spigot-API</name> + <name>Spigot-API</name>
+ <url>http://www.spigotmc.org</url> + <url>http://www.spigotmc.org/</url>
+ <description>An enhanced plugin API for Minecraft servers.</description>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.6</maven.compiler.source>
</properties>
+ <repositories>
+ <repository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/public</url>
+ </repository>
+ </repositories>
+
<distributionManagement>
<repository>
<id>spigotmc-releases</id>
-- --

7
Bukkit-Patches/0029-BungeeCord-Chat-API.patch
View File

@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<artifactId>commons-lang</artifactId> <version>1.14</version>
<version>2.6</version> <scope>compile</scope>
</dependency> </dependency>
+ <dependency> + <dependency>
+ <groupId>net.md-5</groupId> + <groupId>net.md-5</groupId>
@ -19,9 +19,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <type>jar</type> + <type>jar</type>
+ <scope>compile</scope> + <scope>compile</scope>
+ </dependency> + </dependency>
+
<!-- testing --> <!-- testing -->
<dependency> <dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java

2
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<buildtag.suffix></buildtag.suffix> <maven.compiler.target>1.6</maven.compiler.target>
</properties> </properties>
+ <parent> + <parent>