SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream Merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 0acc49565a770628bc80bc7c615d82f2d2c8ccd0 Mon Sep 17 00:00:00 2001
From d126a83bee19a7cad37ba569b9df9e4dc55f5f71 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 7c23af9..c155913 100644
index 56b9e37..e165937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 7c23af9..c155913 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.6.4-R0.1-SNAPSHOT</version>
<version>1.6.4-R1.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@@ -33,8 +33,8 @@ index 7c23af9..c155913 100644
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,25 +24,6 @@
<minecraft_version>1_6_R3</minecraft_version>
@@ -18,25 +26,6 @@
<buildtag.suffix></buildtag.suffix>
</properties>
- <scm>
@@ -59,7 +59,7 @@ index 7c23af9..c155913 100644
<repositories>
<repository>
<id>repobo-snap</id>
@@ -51,8 +40,8 @@
@@ -53,8 +42,8 @@
<dependencies>
<dependency>
@@ -70,7 +70,7 @@ index 7c23af9..c155913 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -105,33 +94,6 @@
@@ -107,33 +96,6 @@
<artifactId>gson</artifactId>
<version>2.1</version>
</dependency>
@@ -104,7 +104,7 @@ index 7c23af9..c155913 100644
<!-- testing -->
<dependency>
<groupId>junit</groupId>
@@ -145,18 +107,23 @@
@@ -147,19 +109,24 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
@@ -125,12 +125,14 @@ index 7c23af9..c155913 100644
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
- <outputPrefix>git-Bukkit-</outputPrefix>
- <outputPrefix>${buildtag.prefix}</outputPrefix>
- <outputPostfix>${buildtag.suffix}</outputPostfix>
+ <outputPrefix>git-Spigot-</outputPrefix>
<outputPostfix></outputPostfix>
+ <outputPostfix></outputPostfix>
</configuration>
<executions>
@@ -210,7 +177,7 @@
<execution>
@@ -212,7 +179,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -140,10 +142,10 @@ index 7c23af9..c155913 100644
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df2efe2..d9396f1 100644
index 85be77e..cee0549 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -208,7 +208,7 @@ public final class CraftServer implements Server {
@@ -210,7 +210,7 @@ public final class CraftServer implements Server {
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
@@ -166,5 +168,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.8.1.2
1.8.3.2