From 62580304f4f488bf8ade7ee95bdabbb5b896f686 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 21 Mar 2016 21:29:41 -0400 Subject: [PATCH] Add Bukkit#reloadPermissions() Fix issues with Paper build #544 --- ...dd-command-to-reload-permissions.yml.patch | 20 ++++++++++++++++++- ...ck-and-TNTPrimed-source-location-API.patch | 12 +++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml.patch b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml.patch index 8ad6b10d3f..728d31b563 100644 --- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml.patch +++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml.patch @@ -1,10 +1,28 @@ -From e78f2b0a6014d98fb0dd2992da41e321176d94ea Mon Sep 17 00:00:00 2001 +From 0c61689b93f5228d8c03e5ba96642b7ec1dcfb3b Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml https://github.com/PaperMC/Paper/issues/49 +diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java +index f93ca2e..5e31665 100644 +--- a/src/main/java/org/bukkit/Bukkit.java ++++ b/src/main/java/org/bukkit/Bukkit.java +@@ -1182,6 +1182,13 @@ public final class Bukkit { + public static CommandMap getCommandMap() { + return server.getCommandMap(); + } ++ ++ /** ++ * Reload the Permissions in permissions.yml ++ */ ++ public static void reloadPermissions() { ++ server.reloadPermissions(); ++ } + // Paper end + + public static Server.Spigot spigot() diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index 91bde81..6b1f2a4 100644 --- a/src/main/java/org/bukkit/Server.java diff --git a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch index ce1ebe73ea..d44229b740 100644 --- a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch +++ b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch @@ -1,4 +1,4 @@ -From e7fb6e898e23e7bf59f294a83f1890bb3afd6054 Mon Sep 17 00:00:00 2001 +From bbaee82283b29db1ea18d5b55d9ae1fdae408f91 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] FallingBlock and TNTPrimed source location API @@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a487c2f..33c3428 100644 +index 83e3003..25edfb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -916,7 +916,10 @@ public class CraftWorld implements World { +@@ -921,7 +921,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -208,7 +208,7 @@ index a487c2f..33c3428 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -952,7 +955,10 @@ public class CraftWorld implements World { +@@ -957,7 +960,10 @@ public class CraftWorld implements World { int type = CraftMagicNumbers.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); @@ -220,7 +220,7 @@ index a487c2f..33c3428 100644 } else if (Projectile.class.isAssignableFrom(clazz)) { if (Snowball.class.isAssignableFrom(clazz)) { entity = new EntitySnowball(world, x, y, z); -@@ -1157,7 +1163,8 @@ public class CraftWorld implements World { +@@ -1162,7 +1168,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { @@ -263,5 +263,5 @@ index c493c9c..eea3238 100644 + // Paper end } -- -2.7.4 +2.5.0