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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 7a2be87999849e59b8ab48ec8e484a107ec49117 Mon Sep 17 00:00:00 2001
From 7b88347fa436856bff54d6f6a10bbad8e4941e5e 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 2f06c8e..bec994f 100644
index b9bbeef..a3e555c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@@ -25,7 +25,7 @@ index 2f06c8e..bec994f 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.7.2-R0.3-SNAPSHOT</version>
<version>1.7.2-R0.4-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@@ -142,10 +142,10 @@ index 2f06c8e..bec994f 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 d27ab8c..e4d7a05 100644
index e6c8575..e33af61 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -225,7 +225,7 @@ public final class CraftServer implements Server {
@@ -303,7 +303,7 @@ public final class CraftServer implements Server {
loadIcon();
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));