diff --git a/Spigot-API-Patches/Add-version-history-to-version-command.patch b/Spigot-API-Patches/Add-version-history-to-version-command.patch index 751463ebb2..846627f759 100644 --- a/Spigot-API-Patches/Add-version-history-to-version-command.patch +++ b/Spigot-API-Patches/Add-version-history-to-version-command.patch @@ -155,13 +155,13 @@ index 000000000..648b247ef + } +} diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index 8e57aa911..746cedd87 100644 +index 73d258763..ee07fe5e8 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -0,0 +0,0 @@ import org.json.simple.parser.ParseException; - // Paper start - import java.io.InputStreamReader; - import java.net.HttpURLConnection; +@@ -0,0 +0,0 @@ import java.net.HttpURLConnection; + import org.json.simple.JSONObject; + import org.json.simple.parser.JSONParser; + import org.json.simple.parser.ParseException; +import com.destroystokyo.paper.VersionHistoryManager; // Paper end diff --git a/Spigot-API-Patches/Check-Paper-versions.patch b/Spigot-API-Patches/Check-Paper-versions.patch index 2cbf51d378..0df1153266 100644 --- a/Spigot-API-Patches/Check-Paper-versions.patch +++ b/Spigot-API-Patches/Check-Paper-versions.patch @@ -5,16 +5,19 @@ Subject: [PATCH] Check Paper versions diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index 0305548e..8e57aa91 100644 +index b8126985d..73d258763 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -0,0 +0,0 @@ import org.json.simple.JSONObject; - import org.json.simple.parser.JSONParser; - import org.json.simple.parser.ParseException; +@@ -0,0 +0,0 @@ import java.util.concurrent.locks.ReentrantLock; + + import org.jetbrains.annotations.NotNull; +// Paper start +import java.io.InputStreamReader; +import java.net.HttpURLConnection; ++import org.json.simple.JSONObject; ++import org.json.simple.parser.JSONParser; ++import org.json.simple.parser.ParseException; +// Paper end + public class VersionCommand extends BukkitCommand { diff --git a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch index fdb3c18596..0eb469a418 100644 --- a/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index d1267f3d72..dcf58e03e4 100644 +index 3fe2aa2313..0422d6e047 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -0,0 +0,0 @@ import com.mojang.brigadier.StringReader; diff --git a/Spigot-Server-Patches/ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/ItemStack-getMaxItemUseDuration.patch index aa6accb4c5..9347192a47 100644 --- a/Spigot-Server-Patches/ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/ItemStack-getMaxItemUseDuration.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index f26ace5cd..713977e3c 100644 +index 886ec71866..ecab15b45a 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -0,0 +0,0 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index f26ace5cd..713977e3c 100644 return this.getItem().c(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 284630f74..1282ee399 100644 +index 284630f74e..1282ee3995 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack { diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch index ce3f1769b3..345fd8e175 100644 --- a/Spigot-Server-Patches/MC-Utils.patch +++ b/Spigot-Server-Patches/MC-Utils.patch @@ -20,7 +20,7 @@ index be179ba213..c53bc8230a 100644 void b(UUID uuid); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 330f5d0c19..37f9037a22 100644 +index 13dc7abc50..9bb7c9c652 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition { @@ -196,7 +196,7 @@ index 8b2000f683..1a3517aeed 100644 // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 892e1aca7e..ed859ccf95 100644 +index d4fe0ab6bf..011c7af218 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity { @@ -277,7 +277,7 @@ index b8abd6363f..a07ee150c2 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 53511f0cc6..d1267f3d72 100644 +index 132fe8e880..3fe2aa2313 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -0,0 +0,0 @@ public final class ItemStack { @@ -742,7 +742,7 @@ index 395215bbdd..f2159bc2dd 100644 int j = 0; ChunkSection[] achunksection = chunk.getSections(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 55b4d57af4..a2ec56bc90 100644 +index 330e74bb91..d97cc4f727 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/Optimize-Hoppers.patch b/Spigot-Server-Patches/Optimize-Hoppers.patch index eb257bcd47..ff350c6d20 100644 --- a/Spigot-Server-Patches/Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/Optimize-Hoppers.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 10efe6b3d..6feea98b6 100644 +index 10efe6b3d9..6feea98b6b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +0,0 @@ public class PaperWorldConfig { @@ -31,7 +31,7 @@ index 10efe6b3d..6feea98b6 100644 private void disableSprintInterruptionOnAttack() { disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 91a9f1bbb..914da48a2 100644 +index 4c2705b731..e4a8ab8591 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -0,0 +0,0 @@ public final class ItemStack { @@ -47,7 +47,7 @@ index 91a9f1bbb..914da48a2 100644 itemstack.d(this.B()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4565a56b3..38c0201ac 100644 +index 4565a56b3f..38c0201acb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -59,7 +59,7 @@ index 4565a56b3..38c0201ac 100644 if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit this.methodProfiler.a(() -> { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 29fe031d8..d67fd92d9 100644 +index 29fe031d85..d67fd92d9d 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -79,7 +79,7 @@ index 29fe031d8..d67fd92d9 100644 this.world.b(this.position, this); if (!this.f.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 559eedfa6..7303a6fdd 100644 +index 559eedfa66..7303a6fdda 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -0,0 +0,0 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/work/Bukkit b/work/Bukkit index 0eaf10f193..451bd74e46 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 0eaf10f193b02ce6e83de436c3e87f282af733f3 +Subproject commit 451bd74e462ddbe3f77afb12db21bc08ed78e76a diff --git a/work/CraftBukkit b/work/CraftBukkit index d65a2576e4..51100db821 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit d65a2576e40e58c8e446b330febe6799d13a604f +Subproject commit 51100db8215f28accb2eeb56f9ee3e661f362d1e