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

Upstream merge

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-14 14:02:09 +01:00
parent d54d6ad87d
commit 51faa817d1
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d36fbfecfe40509da20f581af79322589ead5414 Mon Sep 17 00:00:00 2001
From 0583597f21e65ab38ab36899f99299a6463a1735 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
@@ -142,10 +142,10 @@ index 84a00a3..607be4e 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 111abb8..59010eb 100644
index 3be5174..853e5d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -310,7 +310,7 @@ public final class CraftServer implements Server {
@@ -308,7 +308,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"));
@@ -168,5 +168,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.8.5.2.msysgit.0
1.9.1