Start update, apply API patches

1 files changed, 13 insertions, 13 deletions

diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
index cecb58ef75..25e0de3a4d 100644
--- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch
@@ -272,10 +272,10 @@ index b02efba048be00e42502111fcdd2297529926666..fb4b6f0e908ffa50c3b2f8d04d9f3810
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb341c8eb3b 100644
+index 9d1f82be4f23af37ccc6db65756f6dd3028c6837..fe63fef02ee208a5fc52d30a27519a0506c58f8c 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4867,20 +4867,20 @@ public enum Material implements Keyed, Translatable {
+@@ -4838,20 +4838,20 @@ public enum Material implements Keyed, Translatable {
       * Do not use for any reason.
       *
       * @return ID of this material
@@ -300,7 +300,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public boolean isLegacy() {
          return legacy;
      }
-@@ -4956,8 +4956,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4927,8 +4927,10 @@ public enum Material implements Keyed, Translatable {
       * Gets the MaterialData class associated with this Material
       *
       * @return MaterialData associated with this Material
@@ -311,7 +311,7 @@ index 71302e4bc2a6dd0b6bfdc4355487a8f538aceaea..3913d0392131375d3e3b34c9da3dbbb3
      public Class<? extends MaterialData> getData() {
          Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
          return ctor.getDeclaringClass();
-@@ -5413,7 +5415,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5384,7 +5386,11 @@ public enum Material implements Keyed, Translatable {
       * material.
       *
       * @return true if this material can be interacted with.
@@ -687,10 +687,10 @@ index dd1e7b71d7d332b3e22189c7e0eda6d47ec49e55..555d0492c2fcf85c1e2f95f145b974cb
  
      /**
 diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index aea98cddf2433fff6066124f880bb80e1c32fa17..f5b047345639cf8e55354cc514d18fd80ff1b712 100644
+index 04bbbaba10cdd7ce3c394692579605d66953ac01..95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2 100644
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
-@@ -3576,9 +3576,14 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3551,9 +3551,14 @@ public interface BlockType extends Keyed, Translatable {
       * state as well. This method will return true if there is at least one
       * state in which additional interact handling is performed for the
       * block type.
@@ -809,10 +809,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..875817b807c9f515eb07b03cc85d3689
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 10c957a6bb6227d6c6109085a3b8c3fa5944277c..122ee01c4664617bb1b691d5ff24427abdbedcf2 100644
+index 896b87bfc39b82849e32398161269bffb0577efe..dc944ad75f04f5d2f72639615f64b5bb2d1b4117 100644
 --- a/src/main/java/org/bukkit/entity/EntityType.java
 +++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -428,9 +428,9 @@ public enum EntityType implements Keyed, Translatable {
+@@ -417,9 +417,9 @@ public enum EntityType implements Keyed, Translatable {
       *
       * @param name the entity type's name
       * @return the matching entity type or null
@@ -1748,10 +1748,10 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6
      public ItemStack getInput() {
          return this.ingredient.getItemStack();
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484ac440cb3 100644
+index 5cc1d77a09d2877992433b020ad2c591bb94d3fd..eb14949da2b96aee75e3bba63af8176c5550a380 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -151,6 +151,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -152,6 +152,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Checks for existence of a localized name.
       *
@@ -1759,7 +1759,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return true if this has a localized name
       * @deprecated meta no longer exists
       */
-@@ -163,6 +164,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -164,6 +165,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * Plugins should check that hasLocalizedName() returns <code>true</code>
       * before calling this method.
       *
@@ -1767,7 +1767,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @return the localized name that is set
       * @deprecated meta no longer exists
       */
-@@ -173,6 +175,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -174,6 +176,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
      /**
       * Sets the localized name.
       *
@@ -1775,7 +1775,7 @@ index c81465e35808135329495fc4669d5616421451b7..6ef3b220c7e8d0eef50b70eba02e1484
       * @param name the name to set
       * @deprecated meta no longer exists
       */
-@@ -749,7 +752,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -772,7 +775,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       *
       * @return component
       */