Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-18 13:21:31 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary diff and patch

Browse Source
This commit is contained in:
Ivan Pekov 2020-12-17 20:26:06 +02:00
parent b5b9906d0e
commit a08d6de865
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PATCHES.md
View File

@ -51,7 +51,6 @@ # Patches
| server | DataBits slight optimization | Paul Sauve | | | server | DataBits slight optimization | Paul Sauve | |
| api | Default permissions | William Blake Galbreath | | | api | Default permissions | William Blake Galbreath | |
| server | Despawn rate config options per projectile type | jmp | | | server | Despawn rate config options per projectile type | jmp | |
| server | Disable MapTest | epserv | |
| api | Disable reload command | Ivan Pekov | | | api | Disable reload command | Ivan Pekov | |
| server | Disable the Snooper | Sotr | | | server | Disable the Snooper | Sotr | |
| server | Do not update distance map when animal and mob spawning is | Beech Horn | | | server | Do not update distance map when animal and mob spawning is | Beech Horn | |

10
patches/api/0011-Optimise-Bukkit-s-MapPalette.patch
View File

@ -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 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 --- a/src/main/java/org/bukkit/map/MapPalette.java
+++ b/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 { @@ -22,7 +22,9 @@ public final class MapPalette {
@ -19,7 +19,7 @@ index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..5e938a83377ddf1b952d3597c9974d0c
double rmean = (c1.getRed() + c2.getRed()) / 2.0; double rmean = (c1.getRed() + c2.getRed()) / 2.0;
double r = c1.getRed() - c2.getRed(); double r = c1.getRed() - c2.getRed();
double g = c1.getGreen() - c2.getGreen(); 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 weightG = 4.0;
double weightB = 2 + (255 - rmean) / 256.0; double weightB = 2 + (255 - rmean) / 256.0;
return weightR * r * r + weightG * g * g + weightB * b * b; return weightR * r * r + weightG * g * g + weightB * b * b;
@ -40,11 +40,7 @@ index 95fe3f4d081053a6cf484e4ef07b474f2dc2ab02..5e938a83377ddf1b952d3597c9974d0c
+ // Yatopia end + // Yatopia end
@NotNull @NotNull
- static final Color[] colors = { 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),
@@ -95,6 +111,24 @@ public final class MapPalette { @@ -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(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) c(14, 127, 93), c(17, 155, 114), c(20, 180, 133), c(10, 95, 70)

28
patches/server/0065-Disable-MapTest.patch
View File

@ -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);