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

revert changes to disabled plugins and scheduler.

Browse Source 
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
This commit is contained in:
Spigot
2013-04-03 02:20:29 -05:00
parent fcfb1b5cb0
commit 08676f42a0
52 changed files with 376 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From e480c1604c30348befec70e418fa12b3257165d8 Mon Sep 17 00:00:00 2001
From 7d2497da8d8225a7a90d67ca818b004bc18466da Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Wed, 30 Jan 2013 23:44:29 -0500
Subject: [PATCH] Spigot POM Changes.
---
pom.xml | 44 ++++++++++++--------------------------------
1 file changed, 12 insertions(+), 32 deletions(-)
pom.xml | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2df4906..9d986fa 100644
@@ -68,5 +68,5 @@ index 2df4906..9d986fa 100644
<plugins>
<plugin>
--
1.8.2
1.7.0.4

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

@@ -1,12 +1,12 @@
From 6799cb6eaa5c2f6d572ec20968f5f08d70137e04 Mon Sep 17 00:00:00 2001
From c39140c5533222f176c6705cb1ae26aef0ef7cd9 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.
---
src/main/java/org/bukkit/command/defaults/TimingsCommand.java | 4 ++++
src/main/java/org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+)
.../bukkit/command/defaults/TimingsCommand.java | 4 ++++
.../org/bukkit/plugin/SimplePluginManager.java | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
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
@@ -41,7 +41,7 @@ index 29ebbe0..94cd62c 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 8224d29..2527e71 100644
index 93fb4f5..f5f6941 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -23,6 +23,7 @@ import org.bukkit.Server;
@@ -61,5 +61,5 @@ index 8224d29..2527e71 100644
}
--
1.8.2
1.7.0.4

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

@@ -1,4 +1,4 @@
From 0e45136a44feead58a7f28c99c58e6c39938c0f9 Mon Sep 17 00:00:00 2001
From 9fefede017b0a318fb123c975c54f85095be677c 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.8.2
1.7.0.4

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

@@ -1,11 +1,11 @@
From 767ad529f592e2721f2df2c14f533317eab3ff7c Mon Sep 17 00:00:00 2001
From d2e1a053d9ef3a7631a44c7cca6cca67a0f8ec13 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.
---
src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 file changed, 7 insertions(+)
.../org/bukkit/plugin/java/PluginClassLoader.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
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.8.2
1.7.0.4

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

@@ -1,11 +1,11 @@
From aa48bcce71642e31b6a9447113439c885fbd560d Mon Sep 17 00:00:00 2001
From 28a8f7cc234e1c333e35906ab008befb8eb94ea4 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 file changed, 54 insertions(+)
.../bukkit/event/player/PlayerItemDamageEvent.java | 54 ++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
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.8.2
1.7.0.4

13
Bukkit-Patches/0006-Refactor-conversions-from-LazyMetadataValue-into-abs.patch
View File

@@ -1,8 +1,7 @@
From 0d2be83dcf857b4b29c304bfb4b5d67dde23a13c Mon Sep 17 00:00:00 2001
From 833fa47c9a3aadc2ca8e86319d3f4a2c112f1ad7 Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Sat, 16 Feb 2013 14:33:24 -0700
Subject: [PATCH] Refactor conversions from LazyMetadataValue into abstract
base class
Subject: [PATCH] Refactor conversions from LazyMetadataValue into abstract base class
Implementing MetadataValue interface is significant work due to having
to provide a large amount of conversion stub method. This adds a new
@@ -11,9 +10,9 @@ optional abstract base class to aid in implementation.
Includes comprehensive unit tests including a sample adapter class, and
all existing metadata tests pass.
---
.../org/bukkit/metadata/LazyMetadataValue.java | 60 +----------------
.../org/bukkit/metadata/MetadataValueAdapter.java | 77 ++++++++++++++++++++++
.../bukkit/metadata/MetadataValueAdapterTest.java | 44 +++++++++++++
.../org/bukkit/metadata/LazyMetadataValue.java | 60 +---------------
.../org/bukkit/metadata/MetadataValueAdapter.java | 77 ++++++++++++++++++++
.../bukkit/metadata/MetadataValueAdapterTest.java | 44 +++++++++++
3 files changed, 123 insertions(+), 58 deletions(-)
create mode 100644 src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
create mode 100644 src/test/java/org/bukkit/metadata/MetadataValueAdapterTest.java
@@ -254,5 +253,5 @@ index 0000000..5ae7df4
+ }
+}
--
1.8.1-rc2
1.7.0.4

8
Bukkit-Patches/0007-Clean-up-whitespace.patch
View File

@@ -1,11 +1,11 @@
From c072f0a7250ce40674b9bfbcf8fe52fd28b25716 Mon Sep 17 00:00:00 2001
From e6c68983e8fc1b067e82b3d31b38ecaf66728112 Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Wed, 20 Mar 2013 15:24:12 -0600
Subject: [PATCH] Clean up whitespace.
---
src/main/java/org/bukkit/metadata/LazyMetadataValue.java | 1 -
src/main/java/org/bukkit/metadata/MetadataValueAdapter.java | 6 +++---
.../org/bukkit/metadata/LazyMetadataValue.java | 1 -
.../org/bukkit/metadata/MetadataValueAdapter.java | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/bukkit/metadata/LazyMetadataValue.java b/src/main/java/org/bukkit/metadata/LazyMetadataValue.java
@@ -38,5 +38,5 @@ index 9ec7e61..354b6dc 100644
*
*/
--
1.8.1-rc2
1.7.0.4

8
Bukkit-Patches/0008-Substantially-more-comprehensive-unit-tests.patch
View File

@@ -1,4 +1,4 @@
From 634c75e521140bc33af968f8b5249123eee5aebc Mon Sep 17 00:00:00 2001
From ab04f462db66899843b02b39a05ac1db64abf85b Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Wed, 20 Mar 2013 15:59:03 -0600
Subject: [PATCH] Substantially more comprehensive unit tests.
@@ -7,8 +7,8 @@ Check all the interesting implementation details in metadatavalues
which were never tested before, as well as making sure we document
things thoroughly.
---
.../org/bukkit/metadata/MetadataValueAdapter.java | 2 +-
.../bukkit/metadata/MetadataValueAdapterTest.java | 73 +++++++++++++++++++---
.../org/bukkit/metadata/MetadataValueAdapter.java | 2 +-
.../bukkit/metadata/MetadataValueAdapterTest.java | 73 +++++++++++++++++---
2 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java b/src/main/java/org/bukkit/metadata/MetadataValueAdapter.java
@@ -115,5 +115,5 @@ index 5ae7df4..7d8a17f 100644
private int internalValue = 0;
--
1.8.1-rc2
1.7.0.4

11
Bukkit-Patches/0009-Prevent-classloader-leakage-in-metadata-system.-Fixe.patch
View File

@@ -1,16 +1,15 @@
From 7080e3e4d864249328686c7d04ffba43881a36ed Mon Sep 17 00:00:00 2001
From f9285f05593663ec59cd8df16e499e2eaa58010e Mon Sep 17 00:00:00 2001
From: crast <contact@jamescrasta.com>
Date: Thu, 21 Mar 2013 18:13:20 -0600
Subject: [PATCH] Prevent classloader leakage in metadata system. Fixes
Bukkit-3854
Subject: [PATCH] Prevent classloader leakage in metadata system. Fixes Bukkit-3854
Metadata values keep strong reference to plugins, and they're not
cleared out when plugins are unloaded. This system adds weak reference
logic to allow these values to fall out of scope. In addition we get
some operations turning to O(1) "for free."
---
.../org/bukkit/metadata/MetadataStoreBase.java | 48 ++++++++--------------
.../org/bukkit/metadata/MetadataValueAdapter.java | 8 ++--
.../org/bukkit/metadata/MetadataStoreBase.java | 48 +++++++------------
.../org/bukkit/metadata/MetadataValueAdapter.java | 8 ++-
2 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -135,5 +134,5 @@ index c4b8b39..3b83380 100644
public int asInt() {
--
1.8.1-rc2
1.7.0.4