From e7dc2f5347c48d92355d3b13614909ead30022f5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 14 Apr 2020 12:42:02 +1000 Subject: [PATCH] Rebuild patches --- .../0002-Skeleton-API-Implementations.patch | 16 ++++++++-------- .../0006-Merge-tweaks-and-configuration.patch | 8 ++++---- .../0007-Async-Operation-Catching.patch | 16 ++++++++-------- CraftBukkit-Patches/0009-Spigot-Timings.patch | 8 ++++---- .../0013-Entity-Activation-Range.patch | 12 ++++++------ .../0071-Better-item-validation.patch | 12 ++++++------ .../0072-Further-Seed-Customisation.patch | 6 +++--- .../0089-BungeeCord-Chat-API.patch | 16 ++++++++-------- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 4324654d..cd20414c 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 1de397eaf8d2c42e54e8df8d71d1fa6ca1951929 Mon Sep 17 00:00:00 2001 +From baae8c366dd2878ba545aea9417ccbf322b328fa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -6,7 +6,7 @@ Subject: [PATCH] Skeleton API Implementations This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e3d5b7bd2..52ce4b649 100644 +index 1d7c64d2b..9c9c046e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1929,4 +1929,14 @@ public final class CraftServer implements Server { @@ -25,7 +25,7 @@ index e3d5b7bd2..52ce4b649 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b8e040837..580915d68 100644 +index 65b92006b..d9e930672 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2284,4 +2284,15 @@ public class CraftWorld implements World { @@ -82,10 +82,10 @@ index 993b57b8d..0459f5dfb 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ed700e398..57850343e 100644 +index 1ec15f492..275d41d89 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -977,4 +977,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -979,4 +979,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return perm; } @@ -122,7 +122,7 @@ index cb1efe969..1d4ba473a 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 405c8ba10..97a25ec41 100644 +index 729444c16..deb86613c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1634,4 +1634,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -142,10 +142,10 @@ index 405c8ba10..97a25ec41 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index ab7e3ba63..7eeccddf0 100644 +index cdd7342d0..619805fc1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -@@ -354,4 +354,14 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -353,4 +353,14 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { return builder; } diff --git a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch index 89e0935b..a91deac1 100644 --- a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 640839cf2c2a913ed6f4e2246238644e588cdc2e Mon Sep 17 00:00:00 2001 +From e37e8703a89baae7c974ea9c182401978cf2e2de Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 67ce547fa..7402a094c 100644 +index 128672792..6cf9455a4 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -146,7 +146,10 @@ public class EntityItem extends Entity { @@ -31,12 +31,12 @@ index 67ce547fa..7402a094c 100644 } else { a(entityitem, itemstack1, this, itemstack); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2021f4bdc..c289d5325 100644 +index 4602d978a..a9861b4ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -534,6 +534,23 @@ public class CraftEventFactory { event = CraftEventFactory.callProjectileLaunchEvent(entity); - } else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle){ + } else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle) { event = CraftEventFactory.callVehicleCreateEvent(entity); + // Spigot start + } else if (entity instanceof EntityExperienceOrb) { diff --git a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch index 8f6340bc..dbd64b02 100644 --- a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From e26fb1335110678f5694eb654ea38c1cb24fd5b8 Mon Sep 17 00:00:00 2001 +From 1e767acb416bc5f4056a03f6fee48923a93b4420 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -25,10 +25,10 @@ index 3446ee292..cd72a9c84 100644 world.removeTileEntity(blockposition); } diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java -index c892ec74e..2dd27edc8 100644 +index f047e024b..ca9ed5739 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java -@@ -65,6 +65,7 @@ public class CraftingManager extends ResourceDataJson { +@@ -70,6 +70,7 @@ public class CraftingManager extends ResourceDataJson { // CraftBukkit start public void addRecipe(IRecipe irecipe) { @@ -113,7 +113,7 @@ index 26248d91c..bbe5a08f2 100644 this.entitiesToAdd.add(entity); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b605d0c3c..6771f90c3 100644 +index 8b039899a..6446de65f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -698,6 +698,7 @@ public final class CraftServer implements Server { @@ -125,7 +125,7 @@ index b605d0c3c..6771f90c3 100644 if (commandMap.dispatch(sender, commandLine)) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 580915d68..ff5d0565f 100644 +index d9e930672..c65edb947 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -379,6 +379,7 @@ public class CraftWorld implements World { @@ -177,10 +177,10 @@ index 580915d68..ff5d0565f 100644 try { boolean oldSave = world.savingDisabled; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 57850343e..b48d81e51 100644 +index 275d41d89..978c32b50 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -491,6 +491,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -493,6 +493,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @Override public List getNearbyEntities(double x, double y, double z) { @@ -189,7 +189,7 @@ index 57850343e..b48d81e51 100644 List bukkitEntityList = new java.util.ArrayList(notchEntityList.size()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 97a25ec41..f4420e5e9 100644 +index deb86613c..cdb45b050 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -299,6 +299,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/CraftBukkit-Patches/0009-Spigot-Timings.patch b/CraftBukkit-Patches/0009-Spigot-Timings.patch index 8dc7e5cd..e502aea4 100644 --- a/CraftBukkit-Patches/0009-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0009-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From deb24cd352468dfe6bc7d2273eca7390d13328ee Mon Sep 17 00:00:00 2001 +From 9d6c14b4f982bd050bbf0e56cfc36ab0e577af4f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -574,7 +574,7 @@ index 9fc569a14..30a5342ce 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6771f90c3..9c958eee5 100644 +index 6446de65f..a57715832 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1937,6 +1937,11 @@ public final class CraftServer implements Server { @@ -755,10 +755,10 @@ index 000000000..24d4a488d + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index d694a2a24..b90979c7b 100644 +index ce2e3d282..9ad17c560 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -390,7 +390,9 @@ public class CraftScheduler implements BukkitScheduler { +@@ -396,7 +396,9 @@ public class CraftScheduler implements BukkitScheduler { if (task.isSync()) { currentTask = task; try { diff --git a/CraftBukkit-Patches/0013-Entity-Activation-Range.patch b/CraftBukkit-Patches/0013-Entity-Activation-Range.patch index fa9c9261..a4b7e531 100644 --- a/CraftBukkit-Patches/0013-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0013-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 755dae34376e6c0615157850dac43ed68bd30e61 Mon Sep 17 00:00:00 2001 +From 746d3eba7ded7ce786ef6719f59cbe4bd532e2e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ab1665cbd..54ab3fe9a 100644 +index 9ae74680c..416e4da81 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -166,6 +166,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -148,7 +148,7 @@ index 320817736..4f51b9b65 100644 protected void initDatawatcher() { this.datawatcher.register(EntityFireworks.FIREWORK_ITEM, ItemStack.a); diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 0595fb3e1..f657607a1 100644 +index fc662b5d6..208dad2a3 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -138,6 +138,28 @@ public class EntityItem extends Entity { @@ -221,7 +221,7 @@ index 45ce1d5a4..b6c5e711a 100644 protected void mobTick() { this.world.getMethodProfiler().enter("brain"); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9ffba4b3f..101ee0287 100644 +index 30a5342ce..c3a6848ef 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -359,6 +359,7 @@ public class WorldServer extends World { @@ -262,10 +262,10 @@ index 24d4a488d..2bd22a369 100644 public static final HashMap tileEntityTypeTimingMap = new HashMap(); public static final HashMap pluginTaskTimingMap = new HashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b48d81e51..c781f548b 100644 +index 978c32b50..0a67a57f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -475,6 +475,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -477,6 +477,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); // SPIGOT-619: Force sync head rotation also entity.setHeadRotation(location.getYaw()); diff --git a/CraftBukkit-Patches/0071-Better-item-validation.patch b/CraftBukkit-Patches/0071-Better-item-validation.patch index 714ac2ff..85c786a4 100644 --- a/CraftBukkit-Patches/0071-Better-item-validation.patch +++ b/CraftBukkit-Patches/0071-Better-item-validation.patch @@ -1,4 +1,4 @@ -From d5738244784b7ecc5b0aacf2ef9b64db02de2855 Mon Sep 17 00:00:00 2001 +From c481b995e8481cd4c26b7c2f9bc84f8e747e0142 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 2 Jul 2014 23:35:51 +0100 Subject: [PATCH] Better item validation @@ -20,10 +20,10 @@ index b79a0d2b1..81b6f4581 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index 7eeccddf0..f214e0fc9 100644 +index 619805fc1..a0260ef81 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -@@ -19,6 +19,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; +@@ -18,6 +18,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.inventory.meta.BookMeta; @@ -34,7 +34,7 @@ index 7eeccddf0..f214e0fc9 100644 @DelegateDeserialization(SerializableMeta.class) public class CraftMetaBook extends CraftMetaItem implements BookMeta { static final ItemMetaKey BOOK_TITLE = new ItemMetaKey("title"); -@@ -55,11 +59,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -54,11 +58,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { super(tag); if (tag.hasKey(BOOK_TITLE.NBT)) { @@ -48,7 +48,7 @@ index 7eeccddf0..f214e0fc9 100644 } boolean resolved = false; -@@ -84,7 +88,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -83,7 +87,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { // Ignore and treat as an old book } } @@ -58,7 +58,7 @@ index 7eeccddf0..f214e0fc9 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 9bfbb9057..63a67ea93 100644 +index eedb8d405..da149e51f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -80,6 +80,10 @@ import org.bukkit.inventory.meta.Repairable; diff --git a/CraftBukkit-Patches/0072-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0072-Further-Seed-Customisation.patch index 2d5806d3..294ee0ad 100644 --- a/CraftBukkit-Patches/0072-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0072-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 0ac73134c88db8cce0bcfde0062dab5d48727a33 Mon Sep 17 00:00:00 2001 +From 1516f2a628fb82965db10e549c61705c719ba849 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation @@ -212,10 +212,10 @@ index 9f74e708a..d3dfb786b 100644 l2 *= i1; k2 += random.nextInt(i1 - j1); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index fe95c7bde..299523799 100644 +index 12e791625..a843c66df 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -@@ -170,7 +170,7 @@ public class CraftChunk implements Chunk { +@@ -169,7 +169,7 @@ public class CraftChunk implements Chunk { @Override public boolean isSlimeChunk() { // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk diff --git a/CraftBukkit-Patches/0089-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0089-BungeeCord-Chat-API.patch index 0eb2519c..310ae97e 100644 --- a/CraftBukkit-Patches/0089-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0089-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 883d5e46f78261dc403c4f2033699f5435e063b7 Mon Sep 17 00:00:00 2001 +From ab55cf28b1b189fbf742aa48451a90795f965ebd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 03:06:05 +0100 Subject: [PATCH] BungeeCord Chat API @@ -32,7 +32,7 @@ index 417c26775..fa4eab5b0 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1300f7b73..02364e3c3 100644 +index 19cdd71d8..be30f6bf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -196,6 +196,8 @@ import org.yaml.snakeyaml.Yaml; @@ -88,10 +88,10 @@ index c914c027f..9776746a0 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index c781f548b..63ecbcd47 100644 +index 0a67a57f6..056525526 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -983,6 +983,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -985,6 +985,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { // Spigot start private final Spigot spigot = new Spigot() { @@ -109,7 +109,7 @@ index c781f548b..63ecbcd47 100644 public Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b3f837599..4fed5dc92 100644 +index e3e947f05..f20f72c03 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -117,6 +117,8 @@ import org.bukkit.plugin.Plugin; @@ -161,10 +161,10 @@ index b3f837599..4fed5dc92 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index f214e0fc9..08f3a315f 100644 +index a0260ef81..bf17acbaf 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -@@ -21,6 +21,9 @@ import org.bukkit.inventory.meta.BookMeta; +@@ -20,6 +20,9 @@ import org.bukkit.inventory.meta.BookMeta; // Spigot start import static org.spigotmc.ValidateUtils.*; @@ -174,7 +174,7 @@ index f214e0fc9..08f3a315f 100644 // Spigot end @DelegateDeserialization(SerializableMeta.class) -@@ -361,6 +364,69 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { +@@ -360,6 +363,69 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { // Spigot start private final BookMeta.Spigot spigot = new BookMeta.Spigot() {