From 23fa02d399d097cf989ee304d06f7b096d82312b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Oct 2017 15:19:21 +0000 Subject: [PATCH] Update B/CB/S --- Spigot-Server-Patches/0006-Timings-v2.patch | 22 ++++++++++----------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 2b33a0f34..35ab8156c 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 1f315eea033e36c30cfdf2050d23a4ab56040bfd Mon Sep 17 00:00:00 2001 +From 5fb416e7d1eb7201ddd177b1bae94cd7c64f4ad5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -442,7 +442,7 @@ index 2dca6dbcb..352310960 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d268fec39..52f6242d7 100644 +index c4d9344a7..350e0991d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -900,7 +900,7 @@ public class Chunk { @@ -596,7 +596,7 @@ index e1cb96a88..8f2afcc32 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 c2da96eaf..6d47f384a 100644 +index 8181ab2f2..f54c654fb 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; @@ -984,7 +984,7 @@ index eeac34998..e4ed2e991 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9dc1e2681..c291e2605 100644 +index 516673c0e..8cb7486ba 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1425,7 +1425,7 @@ index 37e3c14fd..fa6a74474 100644 org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 311a2c3f6..000000000 +index 4c8ab2bc9..000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,174 +0,0 @@ @@ -1520,10 +1520,10 @@ index 311a2c3f6..000000000 - * @return - */ - public static CustomTimingsHandler getEntityTimings(Entity entity) { -- String entityType = entity.getClass().getSimpleName(); +- String entityType = entity.getClass().getName(); - CustomTimingsHandler result = entityTypeTimingMap.get(entityType); - if (result == null) { -- result = new CustomTimingsHandler("** tickEntity - " + entityType, activatedEntityTimer); +- result = new CustomTimingsHandler("** tickEntity - " + entity.getClass().getSimpleName(), activatedEntityTimer); - entityTypeTimingMap.put(entityType, result); - } - return result; @@ -1535,10 +1535,10 @@ index 311a2c3f6..000000000 - * @return - */ - public static CustomTimingsHandler getTileEntityTimings(TileEntity entity) { -- String entityType = entity.getClass().getSimpleName(); +- String entityType = entity.getClass().getName(); - CustomTimingsHandler result = tileEntityTypeTimingMap.get(entityType); - if (result == null) { -- result = new CustomTimingsHandler("** tickTileEntity - " + entityType, tickTileEntityTimer); +- result = new CustomTimingsHandler("** tickTileEntity - " + entity.getClass().getSimpleName(), tickTileEntityTimer); - tileEntityTypeTimingMap.put(entityType, result); - } - return result; @@ -1674,7 +1674,7 @@ index ca138fa65..d38900887 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 27725b20e..19adb77b5 100644 +index 23d7ce26f..d50bbd2a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644 } } -- -2.14.1 +2.14.2 diff --git a/work/Bukkit b/work/Bukkit index dcc4266e3..cef79e551 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit dcc4266e331ab53697ba0f56dc3027d2d691cf88 +Subproject commit cef79e55153e438d9ef4b87f4de45cd59233f01e diff --git a/work/CraftBukkit b/work/CraftBukkit index 31d3159f0..53fccdf95 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 31d3159f04d02d240d8f6362835774639e052894 +Subproject commit 53fccdf958fe3e10cb9bdb0f396a454e9ac6ead9 diff --git a/work/Spigot b/work/Spigot index 93e20b365..5695bca2d 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 93e20b3652e42c34d30c306592aaec7fd3a41504 +Subproject commit 5695bca2df7302a6a911e8591591925e8852e0e9