From caec68907dbb19c331df73aae81c30d547216d61 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 17 Nov 2017 09:40:49 +0000 Subject: [PATCH] Update B/CB/S --- Spigot-API-Patches/0001-POM-changes.patch | 69 ++++++++++--------- Spigot-Server-Patches/0001-POM-Changes.patch | 22 ++++-- Spigot-Server-Patches/0006-Timings-v2.patch | 6 +- .../0017-Player-affects-spawning-API.patch | 8 +-- .../0036-Add-player-view-distance-API.patch | 10 +-- .../0065-Complete-resource-pack-API.patch | 10 +-- ...17-Implement-PlayerLocaleChangeEvent.patch | 12 ++-- ...oleAppender-for-console-improvements.patch | 8 +-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 11 files changed, 85 insertions(+), 66 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 75f18f67d7..e269a39cb7 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 9d2397180f0d5ce5b4cce3f1f80c90c860358824 Mon Sep 17 00:00:00 2001 +From a5783dd1bfe8f0f0166976f3afc04a1f35ba3acb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 98f2d67a..49fe56cc 100644 +index 8ee129d9..133d1660 100644 --- a/pom.xml +++ b/pom.xml @@ -3,39 +3,39 @@ @@ -114,34 +114,7 @@ index 98f2d67a..49fe56cc 100644 -@@ -118,26 +133,6 @@ - - - -- -- org.codehaus.mojo -- animal-sniffer-maven-plugin -- 1.16 -- -- -- process-classes -- -- check -- -- -- -- -- -- org.codehaus.mojo.signature -- java16 -- 1.1 -- -- -- - - org.apache.maven.plugins - maven-shade-plugin -@@ -151,6 +146,7 @@ +@@ -131,6 +146,7 @@ @@ -149,6 +122,40 @@ index 98f2d67a..49fe56cc 100644 true +@@ -138,33 +154,4 @@ + + + +- +- +- development +- +- +- +- org.codehaus.mojo +- animal-sniffer-maven-plugin +- 1.16 +- +- +- process-classes +- +- check +- +- +- +- +- +- org.codehaus.mojo.signature +- java16 +- 1.1 +- +- +- +- +- +- +- + -- -2.14.1 +2.15.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index c97675f4e6..0c9f04a13a 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 4daeb84c011999face5942ce02193c4e0ba552c9 Mon Sep 17 00:00:00 2001 +From 06a176da194d6079a94bce3a24f95e2228c96be0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index c73b4b4f5..0c4398228 100644 +index 65dd49259..d49a624ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -107,7 +107,7 @@ index c73b4b4f5..0c4398228 100644 ${maven.build.timestamp} Bukkit ${api.version} -@@ -209,19 +198,22 @@ +@@ -189,19 +178,22 @@ shade @@ -138,7 +138,7 @@ index c73b4b4f5..0c4398228 100644 org.bukkit.craftbukkit org.bukkit.craftbukkit.v${minecraft_version} -@@ -247,23 +239,11 @@ +@@ -227,23 +219,11 @@ org.apache.maven.plugins maven-compiler-plugin 3.7.0 @@ -163,6 +163,18 @@ index c73b4b4f5..0c4398228 100644 ${basedir}/target/test-server +@@ -257,6 +237,11 @@ + + + development ++ ++ ++ true ++ ++ + + + diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d..674096cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -177,5 +189,5 @@ index 93046379d..674096cab 100644 if (stream != null) { -- -2.14.3 +2.15.0 diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index a5809ef99b..f3a7c62071 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From 456890d91c1d97836f3c67cf40acdfa724ac6745 Mon Sep 17 00:00:00 2001 +From 590ff828fdcfe1708f7f5dff3066d1017bad2cd1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1648,7 +1648,7 @@ index 3a95b4465..b5efb9c3f 100644 public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ca138fa65..d38900887 100644 +index 945a2d271..4ad58c034 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1660,7 +1660,7 @@ index ca138fa65..d38900887 100644 import org.bukkit.craftbukkit.block.CraftSign; import org.bukkit.craftbukkit.conversations.ConversationTracker; import org.bukkit.craftbukkit.CraftEffect; -@@ -1625,6 +1625,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1624,6 +1624,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } diff --git a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch index ae213c8ca5..a368b3cb6c 100644 --- a/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0017-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 533744e8d4544784fccf02ee896403323e4790b6 Mon Sep 17 00:00:00 2001 +From d08e91be47f7936e38a46397b196dcdb8e5fdf7c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -70,10 +70,10 @@ index eb27d080c..a35f714eb 100644 if (d3 < 0.0D || d4 < d3 * d3) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d38900887..939233ef7 100644 +index 4ad58c034..af225feef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1488,6 +1488,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1487,6 +1487,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { return getHandle().locale; @@ -91,5 +91,5 @@ index d38900887..939233ef7 100644 // Spigot start -- -2.14.1 +2.15.0 diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch index b6edcb906a..c9ddb09e4d 100644 --- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From db3e5eb562d844d6bfa7dd145b0284b5fcac8566 Mon Sep 17 00:00:00 2001 +From e94c7b36b54d7763f5c7a48d7938925fac5e8ac7 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 480057110..e4a16867e 100644 +index 9829cdd89..5b0675718 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -194,10 +194,10 @@ index e4ed2e991..cfac05750 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b7203df1b..c1dfcf103 100644 +index b178fe9aa..a3e2e7fb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1501,6 +1501,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1500,6 +1500,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().affectsSpawning; } @@ -215,5 +215,5 @@ index b7203df1b..c1dfcf103 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.13.3.windows.1 +2.15.0 diff --git a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch index ce30720fd5..b9ef5b59fd 100644 --- a/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0065-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 22fe86a87519c97ee5197d6badf3fef8c868e0e2 Mon Sep 17 00:00:00 2001 +From 9eea87bda0275ee6c528a2bb2f174a5d8eb1b4b1 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5ebd3c78f..7a721ffc6 100644 +index 5348c0cbc..5cc5dbcd7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -23,7 +23,7 @@ index 5ebd3c78f..7a721ffc6 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7e95ec70f..d5c53032a 100644 +index 357236035..dc9b17350 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -37,7 +37,7 @@ index 7e95ec70f..d5c53032a 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1592,6 +1596,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1591,6 +1595,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } @@ -71,5 +71,5 @@ index 7e95ec70f..d5c53032a 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.14.1 +2.15.0 diff --git a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch index deefa80a33..a81b49c3a4 100644 --- a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From 4d9e75fcdf46bd479e8c6b6884d165640394c6d4 Mon Sep 17 00:00:00 2001 +From d63f6e2ea9bb8f02ea2bf2290fe0492c2e65067f Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e9377ca3..15a448d7 100644 +index e48121b4a..24d3b29a5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand; @@ -45,10 +45,10 @@ index e9377ca3..15a448d7 100644 this.cm = packetplayinsettings.d(); this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e())); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 17a14fdc..41330c2a 100644 +index 7c20ef1b0..7776b09d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1585,8 +1585,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1584,8 +1584,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { @@ -61,7 +61,7 @@ index 17a14fdc..41330c2a 100644 } public void setAffectsSpawning(boolean affects) { -@@ -1723,7 +1725,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1722,7 +1724,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { @@ -71,5 +71,5 @@ index 17a14fdc..41330c2a 100644 @Override -- -2.14.1 +2.15.0 diff --git a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch index eed46fc4c4..56c7b3f3c4 100644 --- a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 2d1ed0e054f43fe5f47c44baac200f17df5dc8c2 Mon Sep 17 00:00:00 2001 +From 27b8e8006467d688fc595a134d1c96611e6b35e0 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -20,7 +20,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 6a0a02883..98972114d 100644 +index d49a624ec..93f70ab21 100644 --- a/pom.xml +++ b/pom.xml @@ -53,12 +53,6 @@ @@ -69,7 +69,7 @@ index 6a0a02883..98972114d 100644 junit -@@ -230,10 +250,18 @@ +@@ -210,10 +230,18 @@ META-INF/services/java.sql.Driver @@ -633,5 +633,5 @@ index 5cee8f00e..08b6bb7f9 100644 -- -2.14.2 +2.15.0 diff --git a/work/Bukkit b/work/Bukkit index 4359dbee24..dceaeb8e5f 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 4359dbee24e331f96bc7ff88ec25e2b74cfbaa7e +Subproject commit dceaeb8e5f0abe7095262066c2bd9837dbafe61e diff --git a/work/CraftBukkit b/work/CraftBukkit index 82f3b02c67..c15d869440 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 82f3b02c675ded7f1c70f84468717a37dfdcf27c +Subproject commit c15d8694401f4982c69c5762852210255ee9703a diff --git a/work/Spigot b/work/Spigot index d21162c022..7129aebca8 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit d21162c022608caa31619b4d2ead39e808947df9 +Subproject commit 7129aebca83ef1d79bb2d026da0b00649b3fc722