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

Update to 1.7.5

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 0ab1f6df9fbd63d6057dd0939c3e1b537297ee85 Mon Sep 17 00:00:00 2001
From beab590a7013a5a335792c7dea8fc8569c304be5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 50f9bae..fb303e2 100644
index a14b55e..b2f4efb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index 50f9bae..fb303e2 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.7.2-R0.4-SNAPSHOT</version>
<version>1.7.5-R0.1-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>
@@ -65,5 +65,5 @@ index 50f9bae..fb303e2 100644
<plugins>
<plugin>
--
1.8.3.2
1.8.5.2.msysgit.0

8
Bukkit-Patches/0002-Measure-Timings-Duration.patch
View File

@@ -1,4 +1,4 @@
From febc38ac8c7a2acfef1892d6aede6b8f3515bb11 Mon Sep 17 00:00:00 2001
From 1f6a76a0f4b393f20dbca3ccfc8521fef61d9832 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Measure Timings Duration
@@ -37,10 +37,10 @@ index 05cfcb0..c2874f1 100644
if (separate) sender.sendMessage("Names written to " + names.getPath());
} catch (IOException e) {
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 787dcfe..b870ecd 100644
index d2fe422..1d51908 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -280,6 +280,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -295,6 +295,7 @@ public final class SimplePluginManager implements PluginManager {
}
}
@@ -49,5 +49,5 @@ index 787dcfe..b870ecd 100644
}
--
1.8.3.2
1.8.5.2.msysgit.0

8
Bukkit-Patches/0004-Enchanced-Timings.patch
View File

@@ -1,4 +1,4 @@
From 1a874bc9cc0a9f5802e8b410ee6cf188794e4967 Mon Sep 17 00:00:00 2001
From 10a9ecc0525f696d36f969090d5393b0c29c151d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 11:17:05 +1000
Subject: [PATCH] Enchanced Timings
@@ -167,10 +167,10 @@ index e09234c..ab2c65e 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 57681dc..075695c 100644
index b178c0d..a1639f8 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -323,7 +323,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -297,7 +297,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
};
@@ -373,5 +373,5 @@ index b206b1f..01b62fb 100644
Listener listener = new Listener() {};
EventExecutor executor = new EventExecutor() {
--
1.8.3.2
1.8.5.2.msysgit.0