Updated Upstream (Bukkit/CraftBukkit) (#6638)

patches/api/0157-Add-Material-Tags.patch

@@ -958,10 +958,10 @@ index 0000000000000000000000000000000000000000..683688edff2c86d92f6b3e15271c3289
 +        .ensureSize("WATER_BASED", 11);
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 53b66c28f0fed97664d0886683731e94ca59bdd2..88ea8b6c5c2c4d2116f646341de62590718bc28c 100644
+index c86ac9f44c81ed86a157f0666b52e8a4d8e9304c..cbe233c67f97452f662bb49ec5778f7187bf3441 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -10,6 +10,10 @@ import org.jetbrains.annotations.NotNull;
+@@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
   * Note that whilst all tags defined within this interface must be present in
   * implementations, their existence is not guaranteed across future versions.
   *

patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch

@@ -21,7 +21,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
-index 963b9ead4ca0426b2e95c5641b0e89317c48853d..a976c32de6ad5e90b0a96a0f387136ab0f5eb52e 100644
+index 963b9ead4ca0426b2e95c5641b0e89317c48853d..39f6afd2f9cbcff6a74a91a21dcc3e29d2497dd8 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java
 @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable {
@@ -57,7 +57,7 @@ index 963b9ead4ca0426b2e95c5641b0e89317c48853d..a976c32de6ad5e90b0a96a0f387136ab
  
 +    public boolean isCancellable() {
 +        return isCancellable;
-+        // paper end
++        // Paper end
 +    }
 +
      @NotNull

patches/api/0264-Added-Vanilla-Entity-Tags.patch

@@ -5,37 +5,49 @@ Subject: [PATCH] Added Vanilla Entity Tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 88ea8b6c5c2c4d2116f646341de62590718bc28c..a2da2cbef6c09b9defbdf97e79cfb3efd742d439 100644
+index cbe233c67f97452f662bb49ec5778f7187bf3441..7893402e43aeaa2846f728b2d6f06fcc93fda23f 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -589,6 +589,32 @@ public interface Tag<T extends Keyed> extends Keyed {
-      * Vanilla fluid tag representing water and flowing water.
+@@ -634,6 +634,44 @@ public interface Tag<T extends Keyed> extends Keyed {
+      * Vanilla tag representing entities extra susceptible to freezing.
       */
-     Tag<Fluid> FLUIDS_WATER = Bukkit.getTag(REGISTRY_FLUIDS, NamespacedKey.minecraft("water"), Fluid.class);
+     Tag<EntityType> ENTITY_TYPES_FREEZE_HURTS_EXTRA_TYPES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("freeze_hurts_extra_types"), EntityType.class);
 +    // Paper start
 +    /**
-+     * Key for the build in entity registry
++     * Key for the built-in entity registry
++     * @deprecated use {@link #REGISTRY_ENTITY_TYPES}
 +     */
++    @Deprecated(forRemoval = true)
 +    String REGISTRY_ENTITIES = "entities";
 +    /**
 +     * Vanilla entity tag representing arrow entities.
++     * @deprecated use {@link #ENTITY_TYPES_ARROWS}
 +     */
++    @Deprecated(forRemoval = true)
 +    Tag<org.bukkit.entity.EntityType> ARROWS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("arrows"), org.bukkit.entity.EntityType.class);
 +    /**
 +     * Vanilla entity tag representing entities that live in beehives
++     * @deprecated use {@link #ENTITY_TYPES_BEEHIVE_INHABITORS}
 +     */
++    @Deprecated(forRemoval = true)
 +    Tag<org.bukkit.entity.EntityType> BEEHIVE_INHABITORS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("beehive_inhabitors"), org.bukkit.entity.EntityType.class);
 +    /**
 +     * Vanilla entity tag representing projectiles that impact
++     * @deprecated use {@link #ENTITY_TYPES_IMPACT_PROJECTILES}
 +     */
++    @Deprecated(forRemoval = true)
 +    Tag<org.bukkit.entity.EntityType> IMPACT_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("impact_projectiles"), org.bukkit.entity.EntityType.class);
 +    /**
 +     * Vanilla entity tag for village raiders
++     * @deprecated use {@link #ENTITY_TYPES_RAIDERS}
 +     */
++    @Deprecated(forRemoval = true)
 +    Tag<org.bukkit.entity.EntityType> RAIDERS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("raiders"), org.bukkit.entity.EntityType.class);
 +    /**
 +     * Vanilla entity tag for skeleton types
++     * @deprecated use {@link #ENTITY_TYPES_SKELETONS}
 +     */
++    @Deprecated(forRemoval = true)
 +    Tag<org.bukkit.entity.EntityType> SKELETONS = Bukkit.getTag(REGISTRY_ENTITIES, NamespacedKey.minecraft("skeletons"), org.bukkit.entity.EntityType.class);
 +    // Paper end