From a08d6de86519ff0667dd9b563e0a171c756af60a Mon Sep 17 00:00:00 2001
From: Ivan Pekov <ivan@mrivanplays.com>
Date: Thu, 17 Dec 2020 20:26:06 +0200
Subject: [PATCH] Remove unnecessary diff and patch

---
 PATCHES.md                                    |  1 -
 .../0011-Optimise-Bukkit-s-MapPalette.patch   | 10 ++-----
 patches/server/0065-Disable-MapTest.patch     | 28 -------------------
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 patches/server/0065-Disable-MapTest.patch

diff --git a/PATCHES.md b/PATCHES.md
index 0bfd2a83..c63619b7 100644
--- a/PATCHES.md
+++ b/PATCHES.md
@@ -51,7 +51,6 @@ # Patches
 | server |  DataBits slight optimization      | Paul Sauve |  |
 | api |  Default permissions      | William Blake Galbreath |  |
 | server |  Despawn rate config options per projectile type      | jmp |  |
-| server |  Disable MapTest      | epserv |  |
 | api |  Disable reload command      | Ivan Pekov |  |
 | server |  Disable the Snooper      | Sotr |  |
 | server |  Do not update distance map when animal and mob spawning is      | Beech Horn |  |
diff --git a/patches/api/0011-Optimise-Bukkit-s-MapPalette.patch b/patches/api/0011-Optimise-Bukkit-s-MapPalette.patch
index d7cf57a8..a795f6b7 100644
--- a/patches/api/0011-Optimise-Bukkit-s-MapPalette.patch
+++ b/patches/api/0011-Optimise-Bukkit-s-MapPalette.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise Bukkit's MapPalette
 
 
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..5e938a83377ddf1b952d3597c9974d0ca79afb79 100644
+index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..beef3860f9f3bdd8c1924663fe5042501bcc6898 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
 @@ -22,7 +22,9 @@ public final class MapPalette {
@@ -19,7 +19,7 @@ index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..5e938a83377ddf1b952d3597c9974d0c
          double rmean = (c1.getRed() + c2.getRed()) / 2.0;
          double r = c1.getRed() - c2.getRed();
          double g = c1.getGreen() - c2.getGreen();
-@@ -31,10 +33,24 @@ public final class MapPalette {
+@@ -31,7 +33,21 @@ public final class MapPalette {
          double weightG = 4.0;
          double weightB = 2 + (255 - rmean) / 256.0;
          return weightR * r * r + weightG * g * g + weightB * b * b;
@@ -40,11 +40,7 @@ index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..5e938a83377ddf1b952d3597c9974d0c
 +    // Yatopia end
  
      @NotNull
--    static final Color[] colors = {
-+    static Color[] colors = { // Yatopia
-         c(0, 0, 0), c(0, 0, 0), c(0, 0, 0), c(0, 0, 0),
-         c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
-         c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
+     static final Color[] colors = {
 @@ -95,6 +111,24 @@ public final class MapPalette {
          c(60, 31, 43), c(74, 37, 53), c(86, 44, 62), c(45, 23, 32),
          c(14, 127, 93), c(17, 155, 114), c(20, 180, 133), c(10, 95, 70)
diff --git a/patches/server/0065-Disable-MapTest.patch b/patches/server/0065-Disable-MapTest.patch
deleted file mode 100644
index 54c690ce..00000000
--- a/patches/server/0065-Disable-MapTest.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: epserv <admin@epserv.ru>
-Date: Thu, 3 Dec 2020 20:27:29 +0500
-Subject: [PATCH] Disable MapTest
-
-
-diff --git a/src/test/java/org/bukkit/map/MapTest.java b/src/test/java/org/bukkit/map/MapTest.java
-index 2dde26d3fd4a51828a0aa6e40831ba33aaebeccc..c49c46e98ce4ff6a83df27399fe04560582069ae 100644
---- a/src/test/java/org/bukkit/map/MapTest.java
-+++ b/src/test/java/org/bukkit/map/MapTest.java
-@@ -39,6 +39,9 @@ public class MapTest {
-                 }
-                 fail = true;
-             } else {
-+                // Yatopia start - disable color checks
-+                // they fail our strategy of speeding up MapPalette
-+                /*
-                 for (int j = 0; j < modifiers.length; j++) {
-                     int modi = modifiers[j];
-                     Color bukkit = bukkitColors[i * 4 + j];
-@@ -55,6 +58,7 @@ public class MapTest {
-                         fail = true;
-                     }
-                 }
-+                 */ // Yatopia end
-             }
-         }
-         Assert.assertFalse(fail);