From 720769bf30890c6cf650f18b0ead0e1047240371 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 May 2017 17:11:28 -0500 Subject: [PATCH] Update upstream B/S --- Spigot-API-Patches/0003-Timings-v2.patch | 8 ++++---- .../0004-Player-affects-spawning-API.patch | 8 ++++---- .../0010-Add-player-view-distance-API.patch | 8 ++++---- .../0022-Complete-resource-pack-API.patch | 10 +++++----- .../0043-Add-String-based-Action-Bar-API.patch | 10 +++++----- .../0002-Paper-config-files.patch | 16 ++++++++-------- Spigot-Server-Patches/0006-Timings-v2.patch | 10 +++++----- ...-client-crashes-server-lists-and-Mojang.patch | 10 +++++----- .../0020-Further-improve-server-tick-loop.patch | 10 +++++----- .../0049-Ensure-commands-are-not-ran-async.patch | 6 +++--- .../0053-Expose-server-CommandMap.patch | 8 ++++---- .../0059-Add-velocity-warnings.patch | 10 +++++----- ...-loading-permissions.yml-before-plugins.patch | 10 +++++----- ...9-Allow-Reloading-of-Custom-Permissions.patch | 8 ++++---- .../0070-Remove-Metadata-on-reload.patch | 8 ++++---- ...rable-Keep-Spawn-Loaded-range-per-world.patch | 6 +++--- ...dd-setting-for-proxy-online-mode-status.patch | 8 ++++---- ...0172-Allow-Reloading-of-Command-Aliases.patch | 8 ++++---- work/Bukkit | 2 +- work/Spigot | 2 +- 20 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 2958d56025..7018e644b0 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 0ffc8e7433517a74d77068bc0e6abf9f48611aae Mon Sep 17 00:00:00 2001 +From 9437b8d896c01fa3e5ceb0f1b1940a119662dab3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3457,10 +3457,10 @@ index a8f61f2d..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9764caa4..266181aa 100644 +index 70eb5eec..845c3670 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1499,6 +1499,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1505,6 +1505,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -3835,5 +3835,5 @@ index 8d982974..7e89b97b 100644 - } } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index 062e764f0d..9db8463478 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From 777ac30514f3a7c0fa43ab7d3a64732580a0236b Mon Sep 17 00:00:00 2001 +From c298dda1b017443cf4d79d4f169344eb68b6c9c0 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d24ef805..01c61e8e 100644 +index 845c3670..95880585 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1396,6 +1396,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1402,6 +1402,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public AdvancementProgress getAdvancementProgress(Advancement advancement); @@ -30,5 +30,5 @@ index d24ef805..01c61e8e 100644 public class Spigot extends Entity.Spigot { -- -2.11.0 +2.13.0.windows.1 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 152fa5ecf6..fa9b8e7755 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From f631e49d52757aad1b6341e3581887327c51aa81 Mon Sep 17 00:00:00 2001 +From 4f3ce608d96482d1906ba64fdcd596f590dfd5d1 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 01c61e8e..dd9a6b2b 100644 +index 95880585..eb738db0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1410,6 +1410,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1416,6 +1416,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setAffectsSpawning(boolean affects); @@ -30,5 +30,5 @@ index 01c61e8e..dd9a6b2b 100644 public class Spigot extends Entity.Spigot { -- -2.11.0 +2.13.0.windows.1 diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch index 3665d5707b..ec44d9d41d 100644 --- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From f43d3f0d7a37ca52a66b336709784c7827e402e8 Mon Sep 17 00:00:00 2001 +From 82ad6d3aa0c24c2bc3fe2bb0e91f49f156d297bf Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 54d05113..f9d24bfd 100644 +index 2c8b46cc..481c39a6 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1179,7 +1179,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1185,7 +1185,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 54d05113..f9d24bfd 100644 public void setResourcePack(String url); /** -@@ -1567,6 +1569,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1573,6 +1575,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline */ public void setViewDistance(int viewDistance); @@ -110,5 +110,5 @@ index 4c498016..4c838519 100644 * Gets the status of this pack. * -- -2.11.0 +2.13.0.windows.1 diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch index b57d32d2ac..82b8eb90a4 100644 --- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 035ce398f1135f3d6b47407cc30365e5c5afca09 Mon Sep 17 00:00:00 2001 +From 30d5e1620c4b712a5a2da06242ad30f5b02256be Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 05b88e5b..5c76497f 100644 +index 481c39a6..1afdde07 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -47,7 +47,7 @@ index 05b88e5b..5c76497f 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1707,9 +1729,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1713,9 +1735,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends the component to the specified screen position of this player * @@ -59,7 +59,7 @@ index 05b88e5b..5c76497f 100644 public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1717,9 +1741,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1723,9 +1747,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline /** * Sends an array of components as a single message to the specified screen position of this player * @@ -72,5 +72,5 @@ index 05b88e5b..5c76497f 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 10201f7b13..97b302983b 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From d5cf62b2b0d9fc6dc5ff86c8667cd033544cc3b0 Mon Sep 17 00:00:00 2001 +From c5c9cf6015a8a80094fb69866fe12f432616f5fc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -311,7 +311,7 @@ index 000000000..621bf7051 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 072dff9b5..30538d8ec 100644 +index f561f2b03..70fde368f 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -326,7 +326,7 @@ index 072dff9b5..30538d8ec 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b2cc418a7..a366b2d70 100644 +index e68d9c9eb..41f0ac2bf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -127,6 +127,8 @@ public abstract class World implements IBlockAccess { @@ -347,10 +347,10 @@ index b2cc418a7..a366b2d70 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f18d6d75c..db23104bc 100644 +index af8e4a81e..83a4692af 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -690,6 +690,7 @@ public final class CraftServer implements Server { +@@ -695,6 +695,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -358,7 +358,7 @@ index f18d6d75c..db23104bc 100644 for (WorldServer world : console.worlds) { world.worldData.setDifficulty(difficulty); world.setSpawnFlags(monsters, animals); -@@ -705,6 +706,7 @@ public final class CraftServer implements Server { +@@ -710,6 +711,7 @@ public final class CraftServer implements Server { world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); } world.spigotConfig.init(); // Spigot @@ -366,7 +366,7 @@ index f18d6d75c..db23104bc 100644 } pluginManager.clearPlugins(); -@@ -712,6 +714,7 @@ public final class CraftServer implements Server { +@@ -717,6 +719,7 @@ public final class CraftServer implements Server { resetRecipes(); reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot @@ -435,5 +435,5 @@ index 01e73eb89..0b66f5e35 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 221d264f48..50e688bf20 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 749d5785a1e24e67652d8abe029784fd73635c4d Mon Sep 17 00:00:00 2001 +From 0c4f7de4d02fd827578c1a3d619e404ec588f49f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -624,7 +624,7 @@ index 70fde368f..c56aa5c19 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ef63b5d3b..0e70cdf6f 100644 +index 48fb9662f..c7b8ae636 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -1416,10 +1416,10 @@ index b924dad97..63c7d4402 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index db23104bc..3114a6ecc 100644 +index 83a4692af..5c05ae407 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1738,6 +1738,7 @@ public final class CraftServer implements Server { +@@ -1743,6 +1743,7 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { @@ -1427,7 +1427,7 @@ index db23104bc..3114a6ecc 100644 @Override public YamlConfiguration getConfig() { -@@ -1745,6 +1746,24 @@ public final class CraftServer implements Server { +@@ -1750,6 +1751,24 @@ public final class CraftServer implements Server { } @Override diff --git a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index d1bc936ddd..92b55bb1cf 100644 --- a/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 58ae4d06fe6ee83f7bdee497d5e12c9d0368592a Mon Sep 17 00:00:00 2001 +From df896d997abf49e32c42289b9d5d6c00be905703 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -20,7 +20,7 @@ index 8361888c2..3623751bf 100644 EULA.a.warn("Failed to save {}", this.b, exception); } finally { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e847f3f1a..577a1b92a 100644 +index 3629cbc47..476d1a23e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1046,7 +1046,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -33,10 +33,10 @@ index e847f3f1a..577a1b92a 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3114a6ecc..70c10f9bb 100644 +index 5c05ae407..bfc42b12f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -135,7 +135,7 @@ import net.md_5.bungee.api.chat.BaseComponent; +@@ -136,7 +136,7 @@ import net.md_5.bungee.api.chat.BaseComponent; public final class CraftServer implements Server { private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0]; @@ -80,5 +80,5 @@ index 94a3d4237..3ed983cc0 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch index 93db0e66b8..d966549e4c 100644 --- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 8d31ccacf327e2e684d86d4172067573732297ed Mon Sep 17 00:00:00 2001 +From 26af014929529ab50947fe07c921db5e1d94f4f3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 577a1b92a..995542ab9 100644 +index 476d1a23e..35e824287 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -113,16 +113,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -147,10 +147,10 @@ index 577a1b92a..995542ab9 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 70c10f9bb..637882f1f 100644 +index bfc42b12f..42b3df58e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1735,6 +1735,17 @@ public final class CraftServer implements Server { +@@ -1740,6 +1740,17 @@ public final class CraftServer implements Server { return CraftMagicNumbers.INSTANCE; } @@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch index 571473c760..e26152a509 100644 --- a/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From 7f73885db5574e32c41bbb683755cbe795c0e6f5 Mon Sep 17 00:00:00 2001 +From adef50ccad5032eebdd7cc3019cda836b625609f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -48,10 +48,10 @@ index 7c4fe706a..9be557062 100644 } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 637882f1f..ac7890a56 100644 +index 42b3df58e..37de0d907 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -640,6 +640,29 @@ public final class CraftServer implements Server { +@@ -641,6 +641,29 @@ public final class CraftServer implements Server { Validate.notNull(sender, "Sender cannot be null"); Validate.notNull(commandLine, "CommandLine cannot be null"); diff --git a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch index 4cb2557195..3007000646 100644 --- a/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0053-Expose-server-CommandMap.patch @@ -1,14 +1,14 @@ -From 2c11024174e60008b865bc4e1f8254eb448fabb3 Mon Sep 17 00:00:00 2001 +From 5f57ef162f3d7123b9f866c412948abbafdd8a8a Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ac7890a56..b196b9911 100644 +index 37de0d907..1381d234e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1546,6 +1546,7 @@ public final class CraftServer implements Server { +@@ -1551,6 +1551,7 @@ public final class CraftServer implements Server { return helpMap; } @@ -17,5 +17,5 @@ index ac7890a56..b196b9911 100644 return commandMap; } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch index 79e863b2e8..9d5703dad3 100644 --- a/Spigot-Server-Patches/0059-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0059-Add-velocity-warnings.patch @@ -1,14 +1,14 @@ -From dc9f3d2376648206d728c2bbed0b0a28e4435e9d Mon Sep 17 00:00:00 2001 +From 1dae630a507144c4669bb19181840fb3860bcb24 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b196b9911..b4cecab30 100644 +index 1381d234e..00208ff45 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -173,6 +173,7 @@ public final class CraftServer implements Server { +@@ -174,6 +174,7 @@ public final class CraftServer implements Server { private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8)); private final List playerView; public int reloadCount; @@ -17,7 +17,7 @@ index b196b9911..b4cecab30 100644 private final class BooleanWrapper { private boolean value = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 63154b647..b2030e8a7 100644 +index 87813d59c..36c90e668 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -237,6 +237,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -58,5 +58,5 @@ index 3ed983cc0..6384d50e7 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log ); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch index 3d0ae46327..13b2f6845d 100644 --- a/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 055ca738e6ed95d61904fb381923d5ff8f480463 Mon Sep 17 00:00:00 2001 +From d0d6eaa5fba325044b1d6e7ef00965570a73580e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -30,10 +30,10 @@ index 3898ad8fa..2f6e169f5 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b4cecab30..2d78acf04 100644 +index 00208ff45..2fc92f308 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -318,6 +318,7 @@ public final class CraftServer implements Server { +@@ -319,6 +319,7 @@ public final class CraftServer implements Server { if (type == PluginLoadOrder.STARTUP) { helpMap.clear(); helpMap.initializeGeneralTopics(); @@ -41,7 +41,7 @@ index b4cecab30..2d78acf04 100644 } Plugin[] plugins = pluginManager.getPlugins(); -@@ -335,7 +336,7 @@ public final class CraftServer implements Server { +@@ -336,7 +337,7 @@ public final class CraftServer implements Server { setVanillaCommands(false); // Spigot end commandMap.registerServerAliases(); @@ -51,5 +51,5 @@ index b4cecab30..2d78acf04 100644 CraftDefaultPermissions.registerCorePermissions(); helpMap.initializeCommands(); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch index 7f10edd23d..2aea19085f 100644 --- a/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 6322e74a8bd36978f6f206bc1cbc5577ffc82e14 Mon Sep 17 00:00:00 2001 +From 06bd3ad9186f8ab23b250d60f4c04cadd05fb4af Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2d78acf04..71c6bca4d 100644 +index 2fc92f308..e564af396 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1824,4 +1824,21 @@ public final class CraftServer implements Server { +@@ -1829,4 +1829,21 @@ public final class CraftServer implements Server { { return spigot; } @@ -32,5 +32,5 @@ index 2d78acf04..71c6bca4d 100644 + // Paper end } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch index 6c3482ec4f..94005f8c64 100644 --- a/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From 654c9d334784b78cfed1d09f6e1d2dc149fa5976 Mon Sep 17 00:00:00 2001 +From f4bb9495fc2831462a5977f76f1f16ff6eda3fdd Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 71c6bca4d..4d07817f3 100644 +index e564af396..522936568 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -734,6 +734,14 @@ public final class CraftServer implements Server { +@@ -739,6 +739,14 @@ public final class CraftServer implements Server { world.paperConfig.init(); // Paper } @@ -26,5 +26,5 @@ index 71c6bca4d..4d07817f3 100644 commandMap.clearCommands(); resetRecipes(); -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 022472e077..1f5a8cc2af 100644 --- a/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From e7e4ca28537998b0f6fe1f8ad176868519f7083c Mon Sep 17 00:00:00 2001 +From d8d0481ba7ddd832f206131c6453ab09ddb574c4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -54,10 +54,10 @@ index fee13283f..33776d905 100644 public void a(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4d07817f3..488c58755 100644 +index 522936568..a7dd7988e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -950,7 +950,7 @@ public final class CraftServer implements Server { +@@ -955,7 +955,7 @@ public final class CraftServer implements Server { System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")"); if (internal.getWorld().getKeepSpawnInMemory()) { diff --git a/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch index afd9acddb6..4b86917a85 100644 --- a/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From 98fd00121d9e00520d1f469117a546d7125e26c1 Mon Sep 17 00:00:00 2001 +From ffd34bc971fda7b78ffb3c1f136a1e7160633693 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status @@ -33,10 +33,10 @@ index b943a9b20..8f3b93dc1 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 488c58755..a1f0ef672 100644 +index a7dd7988e..4d8414369 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1315,7 +1315,8 @@ public final class CraftServer implements Server { +@@ -1320,7 +1320,8 @@ public final class CraftServer implements Server { // Spigot Start GameProfile profile = null; // Only fetch an online UUID in online mode @@ -47,5 +47,5 @@ index 488c58755..a1f0ef672 100644 profile = console.getUserCache().getProfile( name ); } -- -2.13.0 +2.13.0.windows.1 diff --git a/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch index 6eba900b82..b9acbefc5d 100644 --- a/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From ae347d63d60c11864021ec3235b23be383682877 Mon Sep 17 00:00:00 2001 +From ea6cc3c43731c653d25075aedf5cc5a10b359f80 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a1f0ef672..d9fd5429a 100644 +index 4d8414369..d515ef0f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1849,5 +1849,24 @@ public final class CraftServer implements Server { +@@ -1854,5 +1854,24 @@ public final class CraftServer implements Server { }); } } @@ -35,5 +35,5 @@ index a1f0ef672..d9fd5429a 100644 // Paper end } -- -2.13.0 +2.13.0.windows.1 diff --git a/work/Bukkit b/work/Bukkit index 60a4fa84ba..f636d632c5 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 60a4fa84ba7a6254d77017501a900b148aad2bfe +Subproject commit f636d632c5f08faf88d91034ba493020943e2c2f diff --git a/work/Spigot b/work/Spigot index 662916298a..60095c9e3c 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 662916298a344f788a6e3cafaa90f06ad48232d2 +Subproject commit 60095c9e3cb482a4933612f89197c1ec6b74641b