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

Remove a fair chunk of existing patches now applied to CraftBukkit

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-13 17:06:23 +10:00
parent a0c2b2a887
commit ece477d0c7
40 changed files with 116 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
From 62ed461e820ad8337a71486c1dbc2594c9b6e2c6 Mon Sep 17 00:00:00 2001
From 1db91f69acf598609351eec2b307131f30d7da36 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.
diff --git a/pom.xml b/pom.xml
index d5db496..4c8ff29 100644
index 066717d..67a886a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index d5db496..4c8ff29 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.5.1-R0.2-SNAPSHOT</version>
<version>1.5.1-R0.2</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>

41
Bukkit-Patches/0004-Make-the-plugin-class-loader-thread-safe.patch.disable
View File

@@ -1,41 +0,0 @@
From e713a9083b0802334d046915c9f1995326e8956c Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Wed, 17 Oct 2012 22:30:45 +0200
Subject: [PATCH] Make the plugin class loader thread safe
---
src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 10fc26a..4dca063 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -45,6 +45,7 @@ import org.bukkit.plugin.UnknownDependencyException;
import org.yaml.snakeyaml.error.YAMLException;
import com.google.common.collect.ImmutableList;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Represents a Java plugin loader, allowing plugins in the form of .jar
@@ -61,14 +62,14 @@ public class JavaPluginLoader implements PluginLoader {
@Deprecated
protected final Pattern[] fileFilters = fileFilters0;
- private final Map<String, Class<?>> classes0 = new HashMap<String, Class<?>>();
+ private final Map<String, Class<?>> classes0 = new ConcurrentHashMap<String, Class<?>>();
/**
* @deprecated Internal field that wasn't intended to be exposed
*/
@Deprecated
protected final Map<String, Class<?>> classes = classes0;
- private final Map<String, PluginClassLoader> loaders0 = new LinkedHashMap<String, PluginClassLoader>();
+ private final Map<String, PluginClassLoader> loaders0 = new ConcurrentHashMap<String, PluginClassLoader>();
/**
* @deprecated Internal field that wasn't intended to be exposed
*/
--
1.8.1-rc2