From 59b08be5833cc8f2c119ccc11be7d92d69f5ce24 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 4 Jan 2015 12:20:25 +0000 Subject: [PATCH] Fix missing new lines in a few patches --- CraftBukkit-Patches/0016-Metrics.patch | 5 ++--- .../0068-Allow-statistics-to-be-disabled-forced.patch | 11 ++--------- .../0146-Plug-WorldMap-Memory-Leak.patch | 11 ++--------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/CraftBukkit-Patches/0016-Metrics.patch b/CraftBukkit-Patches/0016-Metrics.patch index 0a7ecb0a..5fe4db25 100644 --- a/CraftBukkit-Patches/0016-Metrics.patch +++ b/CraftBukkit-Patches/0016-Metrics.patch @@ -1,4 +1,4 @@ -From 157adb47225e6424cfb87238f8eb0e1527b9e8c3 Mon Sep 17 00:00:00 2001 +From d62890e8db1a0dad0810da3319aa6f13f11b8880 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 Subject: [PATCH] Metrics @@ -6,7 +6,7 @@ Subject: [PATCH] Metrics diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java new file mode 100644 -index 0000000..d9c3b63 +index 0000000..a5fd59d --- /dev/null +++ b/src/main/java/org/spigotmc/Metrics.java @@ -0,0 +1,645 @@ @@ -655,7 +655,6 @@ index 0000000..d9c3b63 + } + } +} -\ No newline at end of file diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index 6837305..fdd4fe1 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch index 0508cb4e..785a9802 100644 --- a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch +++ b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch @@ -1,11 +1,11 @@ -From 4e6febc78313c1e5344d05b05d0931df148f6c4f Mon Sep 17 00:00:00 2001 +From d40a9fc5aab1ccc7bd7bd5803c1f434667b2bb80 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 7 Jan 2014 15:56:26 +0000 Subject: [PATCH] Allow statistics to be disabled/forced diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java -index 4561825..ff35b43 100644 +index 4561825..9906b56 100644 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -31,6 +31,14 @@ public class ServerStatisticManager extends StatisticManager { @@ -39,13 +39,6 @@ index 4561825..ff35b43 100644 int j = statistic.d() ? this.getStatisticValue(statistic) : 0; super.setStatistic(entityhuman, statistic, i); -@@ -210,4 +220,4 @@ public class ServerStatisticManager extends StatisticManager { - return this.g; - } - --} -+} -\ No newline at end of file diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index f3187f8..9566cfa 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch index a135d209..938f7930 100644 --- a/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch +++ b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch @@ -1,11 +1,11 @@ -From 8c6db88680d18e35fe22f17176356c2b08905780 Mon Sep 17 00:00:00 2001 +From 175ee2ca0581ae5c69a4828476dfae14490dda5e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 8 Aug 2014 19:57:03 +1000 Subject: [PATCH] Plug WorldMap Memory Leak diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java -index 6bae818..a4e5294 100644 +index 6bae818..5c36d3e 100644 --- a/src/main/java/net/minecraft/server/PersistentCollection.java +++ b/src/main/java/net/minecraft/server/PersistentCollection.java @@ -18,7 +18,7 @@ public class PersistentCollection { @@ -17,13 +17,6 @@ index 6bae818..a4e5294 100644 private Map d = Maps.newHashMap(); public PersistentCollection(IDataManager idatamanager) { -@@ -181,4 +181,4 @@ public class PersistentCollection { - return oshort.shortValue(); - } - } --} -+} -\ No newline at end of file diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 7b2621c..9bcbba6 100644 --- a/src/main/java/net/minecraft/server/World.java