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

[Cosmetic] Update patches to be generated with latest stable git.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-10 12:36:11 +10:00
parent c35e70ad7d
commit b8055fe033
45 changed files with 337 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Bukkit-Patches/0002-Measure-the-duration-of-the-entire-timings-run.patch
View File

@@ -1,12 +1,12 @@
From c39140c5533222f176c6705cb1ae26aef0ef7cd9 Mon Sep 17 00:00:00 2001
From 6c126ae7abb177b176c616251c667517aa79456d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 9 Jan 2013 16:53:45 -0500
Subject: [PATCH] Measure the duration of the entire timings run.
---
.../bukkit/command/defaults/TimingsCommand.java | 4 ++++
.../org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
src/main/java/org/bukkit/command/defaults/TimingsCommand.java | 4 ++++
src/main/java/org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index 29ebbe0..94cd62c 100644
@@ -61,5 +61,5 @@ index 93fb4f5..f5f6941 100644
}
--
1.7.0.4
1.8.2.1

14
Bukkit-Patches/0003-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From 9fefede017b0a318fb123c975c54f85095be677c Mon Sep 17 00:00:00 2001
From a39f7f351d143b534f6fe754c22efce24b2f6ab1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 9 Jan 2013 22:18:26 -0500
Subject: [PATCH] Improved Timings System
@@ -8,11 +8,11 @@ Tracks timings on sync events a plugin registers (Single and Repeating)
Tracks how many ticks a timed area has caused the server to lose due to taking too long.
Enables automatically pasting to paste.ubuntu.com so you can quickly review the results on aikar.co/timings.php
---
src/main/java/org/bukkit/CustomTimingsHandler.java | 134 ++++++++++++++++++++
.../org/bukkit/command/defaults/ReloadCommand.java | 2 +
.../bukkit/command/defaults/TimingsCommand.java | 90 ++++++++++++--
.../org/bukkit/plugin/TimedRegisteredListener.java | 12 ++-
.../org/bukkit/plugin/java/JavaPluginLoader.java | 2 +-
src/main/java/org/bukkit/CustomTimingsHandler.java | 134 +++++++++++++++++++++
.../org/bukkit/command/defaults/ReloadCommand.java | 2 +
.../bukkit/command/defaults/TimingsCommand.java | 90 ++++++++++++--
.../org/bukkit/plugin/TimedRegisteredListener.java | 12 +-
.../org/bukkit/plugin/java/JavaPluginLoader.java | 2 +-
5 files changed, 227 insertions(+), 13 deletions(-)
create mode 100644 src/main/java/org/bukkit/CustomTimingsHandler.java
@@ -407,5 +407,5 @@ index ea30d83..d905435 100644
} else {
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
--
1.7.0.4
1.8.2.1

8
Bukkit-Patches/0004-Add-nag-for-bad-plugins.patch
View File

@@ -1,11 +1,11 @@
From d2e1a053d9ef3a7631a44c7cca6cca67a0f8ec13 Mon Sep 17 00:00:00 2001
From dc1e04e664925d6c14823cb881c6cb5625fd41f5 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 2 Feb 2013 16:40:42 +1100
Subject: [PATCH] Add nag for bad plugins.
---
.../org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 29ec3fc..a31500c 100644
@@ -26,5 +26,5 @@ index 29ec3fc..a31500c 100644
if (result == null) {
--
1.7.0.4
1.8.2.1

8
Bukkit-Patches/0005-PlayerItemDamageEvent.patch
View File

@@ -1,11 +1,11 @@
From 28a8f7cc234e1c333e35906ab008befb8eb94ea4 Mon Sep 17 00:00:00 2001
From 47fad07cf72d34c038ba0bae648c70a40dd00276 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] PlayerItemDamageEvent
---
.../bukkit/event/player/PlayerItemDamageEvent.java | 54 ++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
.../bukkit/event/player/PlayerItemDamageEvent.java | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java
@@ -69,5 +69,5 @@ index 0000000..38a72ab
+ }
+}
--
1.7.0.4
1.8.2.1