Patches!!!!!!!

patches/unapplied/server/Fix-incosistency-issue-with-empty-map-items-in-CB.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 1 Aug 2021 09:49:06 +0100
-Subject: [PATCH] Fix incosistency issue with empty map items in CB
-
-
-diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/item/MapItem.java
-+++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -0,0 +0,0 @@ public class MapItem extends ComplexItem {
-     public static Integer getMapId(ItemStack stack) {
-         CompoundTag nbttagcompound = stack.getTag();
- 
--        return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag
-+        return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : null; // CraftBukkit - make new maps for no tag // Paper - don't return invalid ID
-     }
- 
-     public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey<Level> dimension) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-@@ -0,0 +0,0 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
- 
-     @Override
-     public int getMapId() {
-+        Preconditions.checkState(this.hasMapView(), "Item does not have map associated - check hasMapView() first!"); // Paper - more friendly message
-         return this.mapId;
-     }
- 

patches/unapplied/server/Stinger-API.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Tue, 22 Jun 2021 23:15:44 -0400
-Subject: [PATCH] Stinger API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         }
-         // Paper end
-     }
-+    // Paper start - Bee Stinger API
-+    @Override
-+    public int getBeeStingerCooldown() {
-+        return getHandle().removeStingerTime;
-+    }
- 
-     // Paper start - Add methods for working with arrows stuck in living entities
-     @Override
-@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     }
-     // Paper end - Add methods for working with arrows stuck in living entities
- 
-+    @Override
-+    public void setBeeStingerCooldown(int ticks) {
-+        getHandle().removeStingerTime = ticks;
-+    }
-+
-+    @Override
-+    public int getBeeStingersInBody() {
-+        return getHandle().getStingerCount();
-+    }
-+
-+    @Override
-+    public void setBeeStingersInBody(int count) {
-+        Preconditions.checkArgument(count >= 0, "New bee stinger amount must be >= 0");
-+        getHandle().setStingerCount(count);
-+    }
-+
-+    @Override
-+    public void setNextBeeStingerRemoval(final int ticks) {
-+        Preconditions.checkArgument(ticks >= 0, "New amount of ticks before next bee stinger removal must be >= 0");
-+        this.getHandle().removeStingerTime = ticks;
-+    }
-+
-+    @Override
-+    public int getNextBeeStingerRemoval() {
-+        return this.getHandle().removeStingerTime;
-+    }
-+    // Paper end - Bee Stinger API
-+
-     @Override
-     public void damage(double amount) {
-         this.damage(amount, this.getHandle().damageSources().generic());