From 93e20b3652e42c34d30c306592aaec7fd3a41504 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 6 Oct 2017 19:54:58 +1100 Subject: [PATCH] SPIGOT-3597: Debug logging not supported --- .../0002-Skeleton-API-Implementations.patch | 8 ++++---- CraftBukkit-Patches/0049-Particle-API.patch | 6 +++--- .../0070-Implement-Silenceable-Lightning-API.patch | 6 +++--- ...t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch | 6 +++--- .../0140-Configurable-Advancement-Disabling.patch | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 4a8aec36..9a78fe54 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 5eae030c5988fbadcbe3687547684a213d58a072 Mon Sep 17 00:00:00 2001 +From 542938822b5c31a5e808edac207500649f94d2fe Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,10 +25,10 @@ index 9f404c1a4..598288620 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b32766959..c113bc62d 100644 +index 1941e3a20..d1eb1e8f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1556,4 +1556,14 @@ public class CraftWorld implements World { +@@ -1557,4 +1557,14 @@ public class CraftWorld implements World { cps.unload(chunk); } } @@ -101,7 +101,7 @@ index 0e1d93432..f9cd769ed 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 9ef7686b3..0ffca4e99 100644 +index 36571353c..7e134db8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -715,4 +715,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/CraftBukkit-Patches/0049-Particle-API.patch b/CraftBukkit-Patches/0049-Particle-API.patch index ef86d617..fcace7d6 100644 --- a/CraftBukkit-Patches/0049-Particle-API.patch +++ b/CraftBukkit-Patches/0049-Particle-API.patch @@ -1,4 +1,4 @@ -From 3cded7e0ba80c5c59f37106e1163298b52602247 Mon Sep 17 00:00:00 2001 +From c7dc5d79d0ebc7c2ffef9ff682174bd4c1acd07c Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -19,7 +19,7 @@ index 16721835a..352ff3af9 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ae00cacc4..4bb5bcfee 100644 +index d8dd70d94..7b0571255 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -833,28 +833,18 @@ public class CraftWorld implements World { @@ -60,7 +60,7 @@ index ae00cacc4..4bb5bcfee 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1562,6 +1552,70 @@ public class CraftWorld implements World { +@@ -1563,6 +1553,70 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0070-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0070-Implement-Silenceable-Lightning-API.patch index 4d78810f..8ef200ae 100644 --- a/CraftBukkit-Patches/0070-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0070-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From ff2ab09b2152dfc919e88781d38e06d0d0b22941 Mon Sep 17 00:00:00 2001 +From 58cfd37e4396c62256c87f1a829c7aa699732a1e Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -40,10 +40,10 @@ index a61531ad2..acb3408d5 100644 // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dG, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fc3c7b35b..3550712cc 100644 +index 8dae24dfa..469c6688f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1621,6 +1621,22 @@ public class CraftWorld implements World { +@@ -1622,6 +1622,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); } diff --git a/CraftBukkit-Patches/0110-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0110-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 81c9982a..65095b99 100644 --- a/CraftBukkit-Patches/0110-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0110-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 1b23be159d586b39b5df7a81dd36d16b560416d9 Mon Sep 17 00:00:00 2001 +From 745c427e087a3dd64ab72be9bfa94edd55b735f1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots @@ -26,10 +26,10 @@ index ee8f07fcc..5a76821ea 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3550712cc..44a3dc9f7 100644 +index 469c6688f..eb6f24e73 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1181,6 +1181,12 @@ public class CraftWorld implements World { +@@ -1182,6 +1182,12 @@ public class CraftWorld implements World { } if (entity != null) { diff --git a/CraftBukkit-Patches/0140-Configurable-Advancement-Disabling.patch b/CraftBukkit-Patches/0140-Configurable-Advancement-Disabling.patch index 7d6e09ca..b50821b2 100644 --- a/CraftBukkit-Patches/0140-Configurable-Advancement-Disabling.patch +++ b/CraftBukkit-Patches/0140-Configurable-Advancement-Disabling.patch @@ -1,4 +1,4 @@ -From 7cf68988c4c4bc67b6a8c4cd79dea1c1faac15e9 Mon Sep 17 00:00:00 2001 +From 8c07e9fc6705d1575ca4328b931e97c4731eff85 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 9 Jun 2017 16:29:31 +1000 Subject: [PATCH] Configurable Advancement Disabling @@ -18,7 +18,7 @@ index 495e7f88e..6896b7095 100644 Iterator iterator = this.data.entrySet().iterator(); diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java -index 5ae0609d8..39a603326 100644 +index 5ae0609d8..db2a1d872 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataWorld.java +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java @@ -153,6 +153,11 @@ public class AdvancementDataWorld { @@ -26,7 +26,7 @@ index 5ae0609d8..39a603326 100644 String s = FilenameUtils.removeExtension(java_nio_file_path2.toString()).replaceAll("\\\\", "/"); MinecraftKey minecraftkey = new MinecraftKey("minecraft", s); + // Spigot start -+ if (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.toString())) { ++ if (org.spigotmc.SpigotConfig.disabledAdvancements != null && (org.spigotmc.SpigotConfig.disabledAdvancements.contains("*") || org.spigotmc.SpigotConfig.disabledAdvancements.contains(minecraftkey.toString()))) { + continue; + } + // Spigot end