Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 08:19:31 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-08-21 22:36:08 +02:00
parent a50e9c9e4e
commit 0995eaa49d
41 changed files with 134 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1
paperRef=4179b8f3fa86437aa1d9742930fd8ca6d23515a0
paperRef=281855c877cf4e78a8a4918c5d89cdab2c5c0861
org.gradle.caching=true
org.gradle.parallel=true

4
patches/api/0003-Gale-configuration.patch
View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..2e93d4c072ed0b67743820801537e20d4c95afe7 100644
index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..1e0bc616b00cd1ec22cb11adb85ee152dc10cd6e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2079,6 +2079,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2119,6 +2119,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

8
patches/api/0008-Player-canSee-by-entity-UUID.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 14c92390aeaeee518f43778ccd5fc820fdc62689..da3e990b2e888387736ffda4a6c9165c5d84248e 100644
index f9dd00210c1762a40259f823aeb8d8a5ddc78e3e..60df0fd1d3ef021cb6aecd8075a1ae87eac5d9eb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -7,6 +7,8 @@ import java.time.Instant;
@@ -49,9 +49,9 @@ index 14c92390aeaeee518f43778ccd5fc820fdc62689..da3e990b2e888387736ffda4a6c9165c
import org.bukkit.BanEntry;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
@@ -1841,6 +1843,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ApiStatus.Experimental
public boolean canSee(@NotNull Entity entity);
@@ -1867,6 +1869,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(@NotNull Player other);
// Paper end
+ // Gale start - Purpur - Player#canSee by entity UUID
+ /**

8
patches/api/0009-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f380a518bc444bfdfbbedf38805c7684e53a5629..6309009fca193e8ceda4b3bf66ad4652e77dd015 100644
index f78b5fd3c3347d28da58777bff88903d2eb140f6..b6fbde1651505bd1c11d01f25ec4a3cdbd1e289e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2187,6 +2187,37 @@ public final class Bukkit {
@@ -2229,6 +2229,37 @@ public final class Bukkit {
return server.getTPS();
}
@@ -49,10 +49,10 @@ index f380a518bc444bfdfbbedf38805c7684e53a5629..6309009fca193e8ceda4b3bf66ad4652
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2e93d4c072ed0b67743820801537e20d4c95afe7..a607520896041a48f2ffb75d4cb374d116fcf25c 100644
index 1e0bc616b00cd1ec22cb11adb85ee152dc10cd6e..5f6e299f62d8c669f4f8ccec19b3055d246df157 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1861,6 +1861,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1901,6 +1901,31 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0010-5-second-TPS-average.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6309009fca193e8ceda4b3bf66ad4652e77dd015..3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f 100644
index b6fbde1651505bd1c11d01f25ec4a3cdbd1e289e..4bd9065b2a0c8dd67d4d7ba90a9be772aeec260c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2187,8 +2187,30 @@ public final class Bukkit {
@@ -2229,8 +2229,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index 6309009fca193e8ceda4b3bf66ad4652e77dd015..3bc5e4fda1551dc1c9e7220d8a5c4883
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a607520896041a48f2ffb75d4cb374d116fcf25c..32d7cad1e2cbf277e6430bf985ecfaf16935d615 100644
index 5f6e299f62d8c669f4f8ccec19b3055d246df157..ddf9462245c159372f6425cd0c4f6264ca689c95 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1861,8 +1861,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1901,8 +1901,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public double[] getTPS();

8
patches/api/0011-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f..cf5cae753357bbe82d280a5c83800be2bb83f299 100644
index 4bd9065b2a0c8dd67d4d7ba90a9be772aeec260c..c0d0604e8d5d1ebf3a3d665a55a02ea12416465f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2763,6 +2763,20 @@ public final class Bukkit {
@@ -2805,6 +2805,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index 3bc5e4fda1551dc1c9e7220d8a5c488398b16d4f..cf5cae753357bbe82d280a5c83800be2
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 32d7cad1e2cbf277e6430bf985ecfaf16935d615..093ba28cc5ab0bf5ef4a9198c1231d160713dbe7 100644
index ddf9462245c159372f6425cd0c4f6264ca689c95..9ff34994f2a4dcf0b10262aacc912d7d283c121e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2417,4 +2417,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2457,4 +2457,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

4
patches/server/0008-Gale-semantic-version.patch
View File

@@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb
}
diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
new file mode 100644
index 0000000000000000000000000000000000000000..ba5ba96bbf5250005aca24aa808ef363899dd161
index 0000000000000000000000000000000000000000..7573fcef20f5e808df402b1d5031b3b760fb1474
--- /dev/null
+++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
@@ -0,0 +1,37 @@
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..ba5ba96bbf5250005aca24aa808ef363
+ * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
+ * such as bug fixes, performance improvements or changes in wording.
+ */
+ public static final @NotNull String version = "0.5.5";
+ public static final @NotNull String version = "0.5.6";
+
+ /**
+ * The "<code>major.minor</code>" portion of the {@link #version}.

16
patches/server/0009-Gale-configuration.patch
View File

@@ -160,10 +160,10 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..6d19b985222d78750828fd2719c1fbf7
}
}
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..141139abcbccc856532c971efcb0e4883ce063af 100644
index e471960e0443392f6f54732b052a4debf2a8fd97..c56b9264d83ae98a4cc0945ea1bd919e9a5de57a 100644
--- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
@@ -134,7 +134,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -135,7 +135,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
SpigotConfig.readConfig(SpigotWorldConfig.class, this);
}
});
@@ -172,7 +172,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..141139abcbccc856532c971efcb0e488
public PaperConfigurations(final Path globalFolder) {
@@ -298,7 +298,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -300,7 +300,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
}
}
@@ -181,7 +181,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..141139abcbccc856532c971efcb0e488
return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig);
}
@@ -399,17 +399,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -401,17 +401,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
}
@@ -199,7 +199,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..141139abcbccc856532c971efcb0e488
@Deprecated
public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
YamlConfiguration config = new YamlConfiguration();
@@ -432,9 +421,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
@@ -434,9 +423,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
}
// Symlinks are not correctly checked in createDirectories
@@ -218,7 +218,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..141139abcbccc856532c971efcb0e488
+ // Gale end - Gale configuration
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6cf49bdf5c337213a474627bc1771ccb14740f0d..04919d27a0ba9d18c1d7cc8969049958839bf023 100644
index 28615e65ab1e0525d2cd4b0a0fca31e37eb8af0e..d645fda67b00aca90091f419226010ee5ff527dd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -457,7 +457,7 @@ index f39ab10c5b0b8d86b579a5b683491204c51db70b..f95aa6362605c10145a212ed4b7df42a
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bb45f1f7691e7ce9ad819a8ceac0d3c3e962a5ce..c2e22dd084d922a827e6dd53e8634ec5b9e2d1ee 100644
index 0f2d8cc6d8a6f6fb53658c0f49de3b76cc716ea1..04dfa4f59921ec5fcea6fb6989847fc5164ccfda 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server {
@@ -468,7 +468,7 @@ index bb45f1f7691e7ce9ad819a8ceac0d3c3e962a5ce..c2e22dd084d922a827e6dd53e8634ec5
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -2902,6 +2903,14 @@ public final class CraftServer implements Server {
@@ -2932,6 +2933,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
patches/server/0015-Use-timin.gs-by-default.patch
View File

@@ -13,10 +13,10 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index d7f541d94941a341a70dfac025a3d3601dd1aca8..53729fcbb297806fb0de78887e4739fbe19dbb69 100644
index 019d3bbd78fb0b06861979d223915fedb6c99442..21f77ea9d8a68eef569f1df6eba0495e5740acdd 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -91,7 +91,7 @@ public class GlobalConfiguration extends ConfigurationPart {
public class Timings extends ConfigurationPart.Post {
public boolean enabled = true;
public boolean verbose = true;

6
patches/server/0016-Recommend-disabling-timings-on-startup.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 53729fcbb297806fb0de78887e4739fbe19dbb69..4594730450e87e71f86c67af205610af1319d4df 100644
index 21f77ea9d8a68eef569f1df6eba0495e5740acdd..7a7d10a9c1764ae618112a453a5191124b1e6e8d 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -50,7 +50,10 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -89,7 +89,10 @@ public class GlobalConfiguration extends ConfigurationPart {
public Timings timings;
public class Timings extends ConfigurationPart.Post {
@@ -46,7 +46,7 @@ index 53729fcbb297806fb0de78887e4739fbe19dbb69..4594730450e87e71f86c67af205610af
public boolean verbose = true;
public String url = "https://timin.gs/"; // Gale - use timin.gs by default
public boolean serverNamePrivacy = false;
@@ -64,6 +67,13 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -103,6 +106,13 @@ public class GlobalConfiguration extends ConfigurationPart {
@Override
public void postProcess() {

30
patches/server/0018-Remove-vanilla-profiler.patch
View File

@@ -73,7 +73,7 @@ index 80c2c8d565f03ae0ea24fbdecdbe2bc5b9aa4b82..3396c696a380f8ac64740acee887de82
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..963e6ea64aeaa8cb453d99c56654df265fb2d343 100644
index ac5028d2682889759cf89a49cf748c1841640d23..157e90f91b7461832ad628d07c3455fa8629d32a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -107,18 +107,9 @@ import net.minecraft.util.ProgressListener;
@@ -496,7 +496,7 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..e49e1f2afdade4dc16aa5239d60c0dcf
++j;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 469083208110d5735e1bbda7a15c55a032d0e8cc..67d778ef115fc1e09fc8fa9c21d17613a11ca17f 100644
index 65d947df910d60f478e7a449eb161e5105e2c0c9..a9e79b340814dfb2d60d51332a8a581298015e4f 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -75,7 +75,6 @@ import net.minecraft.server.level.progress.ChunkProgressListener;
@@ -507,7 +507,7 @@ index 469083208110d5735e1bbda7a15c55a032d0e8cc..67d778ef115fc1e09fc8fa9c21d17613
import net.minecraft.util.thread.BlockableEventLoop;
import net.minecraft.util.thread.ProcessorHandle;
import net.minecraft.util.thread.ProcessorMailbox;
@@ -618,20 +617,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -637,20 +636,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
protected void tick(BooleanSupplier shouldKeepTicking) {
@@ -529,7 +529,7 @@ index 469083208110d5735e1bbda7a15c55a032d0e8cc..67d778ef115fc1e09fc8fa9c21d17613
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 488a253e218409b5f0b4a872cee0928578fa7582..78201998d6cbee9aa6f0bad80b726b46675393dc 100644
index acbcdc8cb1523044b1657e03a141fae6389a3686..c7a8ec6b99e7db62abcbb1d5aed99738ee8732de 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -24,7 +24,6 @@ import net.minecraft.core.SectionPos;
@@ -607,7 +607,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..78201998d6cbee9aa6f0bad80b726b46
this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
int l = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - per player mob spawning
@@ -574,13 +559,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -584,13 +569,11 @@ public class ServerChunkCache extends ChunkSource {
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -621,7 +621,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..78201998d6cbee9aa6f0bad80b726b46
boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
// Paper - only shuffle if per-player mob spawning is disabled
@@ -632,15 +615,12 @@ public class ServerChunkCache extends ChunkSource {
@@ -642,15 +625,12 @@ public class ServerChunkCache extends ChunkSource {
}
// Paper end - optimise chunk tick iteration
this.level.timings.chunkTicks.stopTiming(); // Paper
@@ -637,7 +637,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..78201998d6cbee9aa6f0bad80b726b46
this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing
if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) {
ReferenceOpenHashSet<ChunkHolder> copy = this.chunkMap.needsChangeBroadcasting.clone();
@@ -654,7 +634,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -664,7 +644,6 @@ public class ServerChunkCache extends ChunkSource {
}
}
this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing
@@ -645,7 +645,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..78201998d6cbee9aa6f0bad80b726b46
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
// Paper start - controlled flush for entity tracker packets
List<net.minecraft.network.Connection> disabledFlushes = new java.util.ArrayList<>(this.level.players.size());
@@ -845,7 +824,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -855,7 +834,6 @@ public class ServerChunkCache extends ChunkSource {
@Override
protected void doRunTask(Runnable task) {
@@ -854,10 +854,10 @@ index 513916690d2579760f59edecb1a273f475d54adf..287f6a38a6f042983c5e652ff9800fb2
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index dc5fda83a66afbfeb7897fc20b4742899d8aca08..5986507deeb9f9f05b6045df4ef28afba802274c 100644
index 161c40692e8d469fad4169908b9353be0f85d0d8..2622ee60f839f2af896fbf5d974005518247a5f5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1205,7 +1205,6 @@ public class ServerPlayer extends Player {
@@ -1206,7 +1206,6 @@ public class ServerPlayer extends Player {
PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
if (shapedetectorshape != null) {
@@ -865,7 +865,7 @@ index dc5fda83a66afbfeb7897fc20b4742899d8aca08..5986507deeb9f9f05b6045df4ef28afb
worldserver = shapedetectorshape.world; // CraftBukkit
if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
@@ -1228,8 +1227,6 @@ public class ServerPlayer extends Player {
@@ -1229,8 +1228,6 @@ public class ServerPlayer extends Player {
worldserver = ((CraftWorld) exit.getWorld()).getHandle();
// CraftBukkit end
@@ -874,7 +874,7 @@ index dc5fda83a66afbfeb7897fc20b4742899d8aca08..5986507deeb9f9f05b6045df4ef28afb
if (true) { // CraftBukkit
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -1246,7 +1243,6 @@ public class ServerPlayer extends Player {
@@ -1247,7 +1244,6 @@ public class ServerPlayer extends Player {
this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
worldserver.addDuringPortalTeleport(this);
@@ -883,7 +883,7 @@ index dc5fda83a66afbfeb7897fc20b4742899d8aca08..5986507deeb9f9f05b6045df4ef28afb
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 80e050603e36134754136a8ee2bd14624f976e91..1b66c30ad7b4db4a77aa4da66ce7ed6843bdb370 100644
index e8923befdee3514be5346c6e6c8e7236e7e6e668..afe336563a748c80c09e693ad6b63d8b55ffa2ca 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -397,7 +397,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -979,7 +979,7 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2edab21bb271405f200de5a19e9c748bb14aba7d..be9ac3b5b1107f588f6c00e7768a883691a8adcb 100644
index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e259743a550ef5eb2a19278c527e3c650afd917a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -809,7 +809,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1684,7 +1684,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287
@Override
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 089dd93d4cd4c1f72e63c4944b3b82c1e2ba732d..599efa2ed24e0d4944324c86ca23c38d8b111277 100644
index e85ddf92b4f6f044e2b5834a172f37d78e702ef3..a3de93f3baf8921950f54a5c753e6169ebd90ebe 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -132,7 +132,6 @@ public final class NaturalSpawner {

6
patches/server/0019-Use-platform-math-functions.patch
View File

@@ -99,10 +99,10 @@ public class Main {
```
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index cb4379268b191d331c71be44642baac381ffaaf6..517ea24ed254eaa9c13439b8b83e8391ea5e10ff 100644
index c69088a2ec374b2d236fec61e267f42afa2967b1..d4a26febc956d8a4cecda742b28e2700a1148559 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -164,13 +164,11 @@ public final class MCUtil {
@@ -168,13 +168,11 @@ public final class MCUtil {
}
public static int fastFloor(double x) {
@@ -118,7 +118,7 @@ index cb4379268b191d331c71be44642baac381ffaaf6..517ea24ed254eaa9c13439b8b83e8391
}
public static float normalizeYaw(float f) {
@@ -231,11 +229,11 @@ public final class MCUtil {
@@ -235,11 +233,11 @@ public final class MCUtil {
}
public static int getChunkCoordinate(final double coordinate) {

4
patches/server/0039-Use-ThreadUnsafeRandom-for-mob-spawning.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 599efa2ed24e0d4944324c86ca23c38d8b111277..135c62a90b1cf924812fa4c8c224057eed67a109 100644
index a3de93f3baf8921950f54a5c753e6169ebd90ebe..739ecf5853e7e99ff92604656d61620b93064428 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -415,13 +415,14 @@ public final class NaturalSpawner {
@@ -429,13 +429,14 @@ public final class NaturalSpawner {
}
}

6
patches/server/0040-Remove-streams-and-iterators-from-range-check.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 67d778ef115fc1e09fc8fa9c21d17613a11ca17f..eb12a3c0aefb3d6a42f08439db1ca51e3db65241 100644
index a9e79b340814dfb2d60d51332a8a581298015e4f..f375c8a3cdc88ee8d1a54fb4663d56d190a62faa 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1549,8 +1549,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1586,8 +1586,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}
@@ -65,7 +65,7 @@ index 67d778ef115fc1e09fc8fa9c21d17613a11ca17f..eb12a3c0aefb3d6a42f08439db1ca51e
Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) {
@@ -1562,6 +1584,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1599,6 +1621,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
i = j;
}
}

8
patches/server/0045-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 14ce63f8fbac2214f1653a5388043de0420d7223..6754e0636e5b11f431717e9e77310ac00f8b33b4 100644
index 909e641b94b1a6516171a09df514848cf3c3082e..fb43c428813d05f047a801cff8a2682499a03208 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4300,16 +4300,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4288,16 +4288,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index 14ce63f8fbac2214f1653a5388043de0420d7223..6754e0636e5b11f431717e9e77310ac0
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4317,14 +4319,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4305,14 +4307,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -128,7 +128,7 @@ index 14ce63f8fbac2214f1653a5388043de0420d7223..6754e0636e5b11f431717e9e77310ac0
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4346,9 +4395,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4334,9 +4383,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}

4
patches/server/0047-Make-book-writing-configurable.patch
View File

@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
functionality before additional exploits are found.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1b66c30ad7b4db4a77aa4da66ce7ed6843bdb370..47c6c3b3d0ac90771b872a921dab06832c0c18c2 100644
index afe336563a748c80c09e693ad6b63d8b55ffa2ca..3340aba4f44049407ce273bf73ff2cdf87dc7ed9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -184,6 +184,8 @@ import net.minecraft.world.phys.Vec3;
@@ -34,7 +34,7 @@ index 1b66c30ad7b4db4a77aa4da66ce7ed6843bdb370..47c6c3b3d0ac90771b872a921dab0683
import org.slf4j.Logger;
// CraftBukkit start
@@ -1219,6 +1221,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1224,6 +1226,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleEditBook(ServerboundEditBookPacket packet) {

6
patches/server/0048-Optimize-entity-coordinate-key.patch
View File

@@ -22,10 +22,10 @@ data is already available in the blockPosition struct, so we use that
instead of re-doing the casting.
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index 517ea24ed254eaa9c13439b8b83e8391ea5e10ff..7b3713c8c0840190292a96b7e8b9be620c83274d 100644
index d4a26febc956d8a4cecda742b28e2700a1148559..1eaa559b177f2dc982865f96dfc7654bcfabc62c 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -209,7 +209,7 @@ public final class MCUtil {
@@ -213,7 +213,7 @@ public final class MCUtil {
}
public static long getCoordinateKey(final Entity entity) {
@@ -35,7 +35,7 @@ index 517ea24ed254eaa9c13439b8b83e8391ea5e10ff..7b3713c8c0840190292a96b7e8b9be62
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6754e0636e5b11f431717e9e77310ac00f8b33b4..1e43237008827538773d3299778d6778bee4049b 100644
index fb43c428813d05f047a801cff8a2682499a03208..a33457376dad6f5e9680518ce11bb47c89f59f1e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

4
patches/server/0050-Make-chat-order-verification-configurable.patch
View File

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 47c6c3b3d0ac90771b872a921dab06832c0c18c2..5bd17be075877e49a0ab1023bc486a28b6aa761c 100644
index 3340aba4f44049407ce273bf73ff2cdf87dc7ed9..ceb9692958010e73969ea97731c8ce2f04a73b3f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2413,6 +2413,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2418,6 +2418,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private boolean updateChatOrder(Instant timestamp) {

10
patches/server/0058-Do-not-process-chat-commands-before-player-has-joine.patch
View File

@@ -13,10 +13,10 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5986507deeb9f9f05b6045df4ef28afba802274c..9c99384dac31b94d62d129868ad6f0131dd7bd16 100644
index 2622ee60f839f2af896fbf5d974005518247a5f5..52f6a56f9290fa0fb6537842c9fefe4521cc5859 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
@@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
public boolean joining = true;
public boolean sentListPacket = false;
public boolean supressTrackerForLogin = false; // Paper
@@ -25,10 +25,10 @@ index 5986507deeb9f9f05b6045df4ef28afba802274c..9c99384dac31b94d62d129868ad6f013
// CraftBukkit end
public boolean isRealPlayer; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5bd17be075877e49a0ab1023bc486a28b6aa761c..9e7c92730f04827d6052dce5b10453e67b70a682 100644
index ceb9692958010e73969ea97731c8ce2f04a73b3f..cbc086e94e2327852880c3c4fcd55bd6d8660ecd 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2390,6 +2390,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2395,6 +2395,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
this.send(new ClientboundSystemChatPacket(PaperAdventure.asAdventure(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED)), false)); // Paper - Adventure
return Optional.empty();
@@ -40,7 +40,7 @@ index 5bd17be075877e49a0ab1023bc486a28b6aa761c..9e7c92730f04827d6052dce5b10453e6
this.player.resetLastActionTime();
return optional;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 640e9bd618dc8286933318744c2064ede1fd9b5f..22697de39b8d00a522689d5abf894621cf051c89 100644
index f097ec5b4e3ad6b1a7c464a8cff4f8b2568fcf4f..c9fc92c2d2e9c46b3d9009105ccd36181b744a42 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -342,6 +342,8 @@ public abstract class PlayerList {

4
patches/server/0060-Do-not-log-empty-message-warnings.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9e7c92730f04827d6052dce5b10453e67b70a682..ba2eb5818c1170eea9f455b7caeb3484e51ec395 100644
index cbc086e94e2327852880c3c4fcd55bd6d8660ecd..904284eebdc51360f0a8bc2015efb62fe20a4c70 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -185,6 +185,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index 9e7c92730f04827d6052dce5b10453e67b70a682..ba2eb5818c1170eea9f455b7caeb3484
import org.galemc.gale.configuration.GaleGlobalConfiguration;
import org.slf4j.Logger;
@@ -2596,7 +2597,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2601,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
// CraftBukkit start
String s = message.signedContent();
if (s.isEmpty()) {

4
patches/server/0067-Do-not-log-out-of-order-message-warnings.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ba2eb5818c1170eea9f455b7caeb3484e51ec395..1871a4ac9616ddc533dbbe6ae15022bfdaafa715 100644
index 904284eebdc51360f0a8bc2015efb62fe20a4c70..451b26fb1bda92872e31c62d0ce352c68215320b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2380,7 +2380,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2385,7 +2385,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
if (!this.updateChatOrder(timestamp)) {

4
patches/server/0068-Do-not-log-Not-Secure-marker.patch
View File

@@ -28,7 +28,7 @@ index 774fb97912f766589f3548f659618ad554e0503f..bec9a8ca016f23352ba51e5f70ecb9a0
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 22697de39b8d00a522689d5abf894621cf051c89..cf717e46b82d8842c97d2c8aa172d02bb788184a 100644
index c9fc92c2d2e9c46b3d9009105ccd36181b744a42..69de848ce633f9ce40828f025391f7c189d07b43 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -101,6 +101,7 @@ import net.minecraft.world.scores.Objective;
@@ -39,7 +39,7 @@ index 22697de39b8d00a522689d5abf894621cf051c89..cf717e46b82d8842c97d2c8aa172d02b
import org.slf4j.Logger;
// CraftBukkit start
@@ -1404,7 +1405,7 @@ public abstract class PlayerList {
@@ -1412,7 +1413,7 @@ public abstract class PlayerList {
// Paper end
boolean flag = this.verifyChatTrusted(message);

4
patches/server/0084-Make-logging-login-locations-configurable.patch
View File

@@ -13,10 +13,10 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index cf717e46b82d8842c97d2c8aa172d02bb788184a..4c5d2c3e50be81435260207dc1208c083a8201e6 100644
index 69de848ce633f9ce40828f025391f7c189d07b43..6fefed8e329aa85b6edd0e5981db2336d23446fc 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -480,7 +480,13 @@ public abstract class PlayerList {
@@ -488,7 +488,13 @@ public abstract class PlayerList {
}
// Paper end
// CraftBukkit - Moved from above, added world

12
patches/server/0085-Reduce-array-allocations.patch
View File

@@ -412,7 +412,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..f06cafd80d7c027ca97e50bcb45ad520
OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 963e6ea64aeaa8cb453d99c56654df265fb2d343..9c99883afefe882f5669c4317e6d07a10713e617 100644
index 157e90f91b7461832ad628d07c3455fa8629d32a..4e6107114a23fd978e38c8a4b072057520285d36 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -50,6 +50,8 @@ import java.util.stream.Collectors;
@@ -425,7 +425,7 @@ index 963e6ea64aeaa8cb453d99c56654df265fb2d343..9c99883afefe882f5669c4317e6d07a1
import net.minecraft.ReportedException;
import net.minecraft.SharedConstants;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index e215cb22a226fa61d7eb9a8f69fe2a644d4394f7..d23fe810b1b971abe4ed52018929a40817060fdc 100644
index 8c28305ffdb210722b11a0bdcf077452d09bcc2d..95a17b9d3397516ce4cb4334e01cee2a391ad2fb 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -332,7 +332,7 @@ public class ServerEntity {
@@ -469,7 +469,7 @@ index efbc8483a51c5272ca81747c82dc65e7f0f5c232..9879599c38db4f3332c347b6b0c26034
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1871a4ac9616ddc533dbbe6ae15022bfdaafa715..16df8c2b704225461dfadc64b1fb25f3f5003559 100644
index 451b26fb1bda92872e31c62d0ce352c68215320b..4c3cc426978be322efc9e051e048c2192bbdc221 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
@@ -531,7 +531,7 @@ index 1871a4ac9616ddc533dbbe6ae15022bfdaafa715..16df8c2b704225461dfadc64b1fb25f3
return;
}
// Paper end
@@ -3351,7 +3349,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3357,7 +3355,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
// Paper start
if (!org.bukkit.Bukkit.isPrimaryThread()) {
if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -578,7 +578,7 @@ index 0d034a1b810e3840055a10ca1960eecbbf306549..00166d86baad60beed5896871c9b9118
final String s;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4c5d2c3e50be81435260207dc1208c083a8201e6..87fabd874b39a6a21ca7fb2c6207a4cec048328c 100644
index 6fefed8e329aa85b6edd0e5981db2336d23446fc..d75487fa0f6bd838e0ffa90fdf16758ee36009e5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -27,6 +27,8 @@ import java.util.UUID;
@@ -590,7 +590,7 @@ index 4c5d2c3e50be81435260207dc1208c083a8201e6..87fabd874b39a6a21ca7fb2c6207a4ce
import net.minecraft.ChatFormatting;
import net.minecraft.FileUtil;
import net.minecraft.commands.CommandSourceStack;
@@ -709,7 +711,7 @@ public abstract class PlayerList {
@@ -717,7 +719,7 @@ public abstract class PlayerList {
while (iterator.hasNext()) {
entityplayer = (ServerPlayer) iterator.next();
this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved

6
patches/server/0095-Cache-BlockStatePairKey-hash.patch
View File

@@ -13,10 +13,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index c4cff3592a39e519fc62664a21d368d8cac55271..e9d37ab8e2b072454c46d4520491beac5873a7ec 100644
index 9a4bb34cc29ad0c4391db94e638ee47ab53d5f3a..5f607c2d58a7b1016f6cc4a06e2abf5aabc0a462 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -593,11 +593,18 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -601,11 +601,18 @@ public class Block extends BlockBehaviour implements ItemLike {
private final BlockState first;
private final BlockState second;
private final Direction direction;
@@ -35,7 +35,7 @@ index c4cff3592a39e519fc62664a21d368d8cac55271..e9d37ab8e2b072454c46d4520491beac
}
public boolean equals(Object object) {
@@ -613,11 +620,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -621,11 +628,7 @@ public class Block extends BlockBehaviour implements ItemLike {
}
public int hashCode() {

10
patches/server/0115-Spread-out-sending-all-player-info.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 87fabd874b39a6a21ca7fb2c6207a4cec048328c..80b49fc41d8c9c9f387f85d993433857ff48f55e 100644
index d75487fa0f6bd838e0ffa90fdf16758ee36009e5..ac145b9020f0dc25a98b2705d557a5c94c458379 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -15,6 +15,8 @@ import java.net.SocketAddress;
@@ -70,7 +70,7 @@ index 87fabd874b39a6a21ca7fb2c6207a4cec048328c..80b49fc41d8c9c9f387f85d993433857
this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
this.playersByUUID.put(player.getUUID(), player);
// this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
@@ -657,6 +661,7 @@ public abstract class PlayerList {
@@ -665,6 +669,7 @@ public abstract class PlayerList {
entityplayer.retireScheduler(); // Paper - Folia schedulers
entityplayer.getAdvancements().stopListening();
this.players.remove(entityplayer);
@@ -78,7 +78,7 @@ index 87fabd874b39a6a21ca7fb2c6207a4cec048328c..80b49fc41d8c9c9f387f85d993433857
this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
UUID uuid = entityplayer.getUUID();
@@ -810,6 +815,7 @@ public abstract class PlayerList {
@@ -818,6 +823,7 @@ public abstract class PlayerList {
// Paper end
entityplayer.stopRiding(); // CraftBukkit
this.players.remove(entityplayer);
@@ -86,7 +86,7 @@ index 87fabd874b39a6a21ca7fb2c6207a4cec048328c..80b49fc41d8c9c9f387f85d993433857
this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
entityplayer.serverLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED);
BlockPos blockposition = entityplayer.getRespawnPosition();
@@ -947,6 +953,7 @@ public abstract class PlayerList {
@@ -955,6 +961,7 @@ public abstract class PlayerList {
if (!entityplayer.connection.isDisconnected()) {
worldserver1.addRespawnedPlayer(entityplayer1);
this.players.add(entityplayer1);
@@ -94,7 +94,7 @@ index 87fabd874b39a6a21ca7fb2c6207a4cec048328c..80b49fc41d8c9c9f387f85d993433857
this.playersByName.put(entityplayer1.getScoreboardName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot
this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
}
@@ -999,20 +1006,55 @@ public abstract class PlayerList {
@@ -1007,20 +1014,55 @@ public abstract class PlayerList {
this.sendPlayerPermissionLevel(player, i);
}

4
patches/server/0116-Optimize-player-list-for-sending-player-info.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 80b49fc41d8c9c9f387f85d993433857ff48f55e..ed7ecc89a5b0ebd24c677adb93e512b29d2cb5b5 100644
index ac145b9020f0dc25a98b2705d557a5c94c458379..814a3db7c5e1fe6a2b679a03483c98eefa493862 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1042,14 +1042,18 @@ public abstract class PlayerList {
@@ -1050,14 +1050,18 @@ public abstract class PlayerList {
// Gale start - Purpur - spread out sending all player info
ServerPlayer[] sendAllPlayerInfoBucket = this.sendAllPlayerInfoBuckets[this.sendAllPlayerInfoIn];
if (sendAllPlayerInfoBucket != null) {

4
patches/server/0118-Send-multiple-keep-alive-packets.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 16df8c2b704225461dfadc64b1fb25f3f5003559..35f88385ed5b7a5a22486d801052f61300a97fe1 100644
index 4c3cc426978be322efc9e051e048c2192bbdc221..2fe85168935d2b558fd33a9f5b53dc1c1d5024f2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -91,7 +91,7 @@ index 16df8c2b704225461dfadc64b1fb25f3f5003559..35f88385ed5b7a5a22486d801052f613
if (this.keepAlivePending) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -3543,6 +3564,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3549,6 +3570,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

8
patches/server/0120-Make-max-interaction-distance-configurable.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index baf3e79489e310f443788bc917c553ae7ea86c89..f830ff98ac6e94fa4f0c9d85bcdd8f3816ecc645 100644
index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..98b5efcea7d54a8132aab84d1de2d1f799556436 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -174,7 +174,7 @@ public class ServerPlayerGameMode {
@@ -20,7 +20,7 @@ index baf3e79489e310f443788bc917c553ae7ea86c89..f830ff98ac6e94fa4f0c9d85bcdd8f38
this.debugLogging(pos, false, sequence, "too far");
} else if (pos.getY() >= worldHeight) {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 35f88385ed5b7a5a22486d801052f61300a97fe1..c6d13f1df78d93fb4a21e6733c4ca7d22464bded 100644
index 2fe85168935d2b558fd33a9f5b53dc1c1d5024f2..249f3b7671d4d5c6072b256afdec31ce948bd306 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -256,7 +256,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -46,7 +46,7 @@ index 35f88385ed5b7a5a22486d801052f61300a97fe1..c6d13f1df78d93fb4a21e6733c4ca7d2
@Override
public void tick() {
if (this.ackBlockChangesUpTo > -1) {
@@ -2012,7 +2019,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2017,7 +2024,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
BlockPos blockposition = movingobjectpositionblock.getBlockPos();
Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
@@ -55,7 +55,7 @@ index 35f88385ed5b7a5a22486d801052f61300a97fe1..c6d13f1df78d93fb4a21e6733c4ca7d2
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;
@@ -2876,7 +2883,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2881,7 +2888,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
AABB axisalignedbb = entity.getBoundingBox();

4
patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ccb2722e8025b97d972cafac5258676cb4a29390..ffb0e9a5c24d7c95f1cc1fe495ac4d76c6362eb8 100644
index 706b9606e17f10376a7ed96a829ff49d43dd7387..2689e7006e7350db206c2401344f01a0f09ba6bc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4519,6 +4519,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4507,6 +4507,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return this.feetBlockState;
}

4
patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch
View File

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9c99384dac31b94d62d129868ad6f0131dd7bd16..8e216eaafb1b90d4fd373a4384ecff0b1e917835 100644
index 52f6a56f9290fa0fb6537842c9fefe4521cc5859..df640e94bf51cfa62ccd28e32c0adc1c76ec07a6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1908,12 +1908,18 @@ public class ServerPlayer extends Player {
@@ -1909,12 +1909,18 @@ public class ServerPlayer extends Player {
@Override
public void crit(Entity target) {

8
patches/server/0126-Skip-unnecessary-mob-spawning-computations.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff869165bd40d3 100644
index 6c77db5edce2101847234f65bd10c5841fd5bd4f..075c476cdf02ece97c5e0032726ae1b560825ce1 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -543,10 +543,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -33,7 +33,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
// re-set mob counts
for (ServerPlayer player : this.level.players) {
@@ -560,13 +565,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -570,13 +575,16 @@ public class ServerChunkCache extends ChunkSource {
this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.lastSpawnState = spawnercreature_d;
@@ -52,7 +52,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
// Paper - only shuffle if per-player mob spawning is disabled
// Paper - moved natural spawn event up
@@ -596,7 +604,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -606,7 +614,7 @@ public class ServerChunkCache extends ChunkSource {
if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
chunk1.incrementInhabitedTime(j);
@@ -61,7 +61,7 @@ index 041f188b742ad819e2460e8ca5ab7f44412dbf9b..3c9ff57cf8cf7e7bfca234e460ff8691
NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
}
@@ -657,6 +665,20 @@ public class ServerChunkCache extends ChunkSource {
@@ -667,6 +675,20 @@ public class ServerChunkCache extends ChunkSource {
}
}

4
patches/server/0131-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9855ce266ef6d8fb75376160f353fa21db784a97..3f7af9fde58937cc8b6bb7d7c114304c4b002168 100644
index d8e34ad5c2e79a0a766dd1cd33b9f7328b0ef563..c451746873a2e4cc79225d91995b10877037bcba 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2871,6 +2871,25 @@ public final class CraftServer implements Server {
@@ -2901,6 +2901,25 @@ public final class CraftServer implements Server {
};
}

6
patches/server/0132-5-second-TPS-average.patch
View File

@@ -59,7 +59,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..fac07dda413002c12276131efbe4ee38
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9c99883afefe882f5669c4317e6d07a10713e617..ba5ca4f0cb3385911c51cd42c682d3125652880a 100644
index 4e6107114a23fd978e38c8a4b072057520285d36..dad215d8eae5171b20b0e4417bed3b8f9aedd698 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1027,6 +1027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -79,10 +79,10 @@ index 9c99883afefe882f5669c4317e6d07a10713e617..ba5ca4f0cb3385911c51cd42c682d312
tps5.add(currentTps, diff);
tps15.add(currentTps, diff);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3f7af9fde58937cc8b6bb7d7c114304c4b002168..8d0f0a7723e1c06bea8516e9fd8f2e71a5744acb 100644
index c451746873a2e4cc79225d91995b10877037bcba..a1802efea9175cb1ffe02c555bee21643f355389 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2871,8 +2871,27 @@ public final class CraftServer implements Server {
@@ -2901,8 +2901,27 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0134-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8d0f0a7723e1c06bea8516e9fd8f2e71a5744acb..58642c412f5ca3bcd462017ff83f8ba8397d57a0 100644
index a1802efea9175cb1ffe02c555bee21643f355389..5d3a5bdd8e223ff45320d3a8ac9e57d5d7ff02bf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3170,4 +3170,22 @@ public final class CraftServer implements Server {
@@ -3200,4 +3200,22 @@ public final class CraftServer implements Server {
}
// Paper end

6
patches/server/0140-Reduce-RandomSource-instances.patch
View File

@@ -26,10 +26,10 @@ index f5bc3497831877e0c2b7dc1cbd8abe3a67d7695b..5783a8014e3faf93b81903c947b2534e
double d1 = (double) (center.y - maxRange);
double d2 = (double) (center.x + maxRange);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8e216eaafb1b90d4fd373a4384ecff0b1e917835..43c170fe1eed27e1b0367a3b277cc6d034bc34e1 100644
index df640e94bf51cfa62ccd28e32c0adc1c76ec07a6..c97a719033ef075f2cc29f6e4e5327db12e24b8d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -441,7 +441,7 @@ public class ServerPlayer extends Player {
@@ -442,7 +442,7 @@ public class ServerPlayer extends Player {
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);
@@ -38,7 +38,7 @@ index 8e216eaafb1b90d4fd373a4384ecff0b1e917835..43c170fe1eed27e1b0367a3b277cc6d0
for (int l1 = 0; l1 < i1; ++l1) {
int i2 = (k1 + j1 * l1) % i1;
@@ -478,7 +478,7 @@ public class ServerPlayer extends Player {
@@ -479,7 +479,7 @@ public class ServerPlayer extends Player {
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);

10
patches/server/0141-Add-xor-shift-random.patch
View File

@@ -27,10 +27,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
index e5ea9f27a1936ed9e329e74317c91c5df89b9fbd..3913d5fe2f22cd49e4c2b201163881553e7c6884 100644
index 5408cbc21fc7577a6100b5a1ca0463e899d2df8b..8bb5d662d62b0c16dc769d69ca45959e6c3164de 100644
--- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
@@ -13,7 +13,7 @@ import java.util.UUID;
@@ -16,7 +16,7 @@ import java.util.UUID;
public class PaperLootableInventoryData {
@@ -66,7 +66,7 @@ index 0c5ac12b1f395bba8b7fc50baf8e825ba6488f6c..0671e775ab296d6d591a31a8a0c38f62
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 550dcb7d595221b221e4710890d8a3cad789fc07..0cc4025613df85ace29db75cb8c4a465a69b1a06 100644
index f857f490ffba2f25f7c06c5fb1a1905f0b51fbe2..18408d64905571283551c358f472c37f8b2593ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -229,7 +229,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -79,10 +79,10 @@ index 550dcb7d595221b221e4710890d8a3cad789fc07..0cc4025613df85ace29db75cb8c4a465
public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
this.world = world;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
index d1c7ab67cba881d96b7a5e9220130d86d0514304..ef1b30f3e757f7abaeb55728b50643eef9dfd949 100644
index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..bf9deb9a5f7eae6517fcd6d4476a7961ae3b23b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -15,7 +15,7 @@ import org.bukkit.inventory.meta.FireworkMeta;
@@ -14,7 +14,7 @@ import org.bukkit.inventory.meta.FireworkMeta;
public class CraftFirework extends CraftProjectile implements Firework {

13
patches/server/0142-Server-thread-priority-environment-variable.patch
View File

@@ -7,24 +7,27 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3c0e0a884cde094054e79aa4d2cf915126bddba4..77dd3605bede2f8d2574961a21560df4631f6277 100644
index 1431d13a8175631e7a3225c046b2e69aa0701405..2649d01a1fb8633dc47350f0078ea24aee22ebb6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, AutoCloseable {
+ public static final int SERVER_THREAD_PRIORITY = Integer.getInteger("gale.thread.priority.server", 8); // Gale - server thread priority environment variable
+ public static final int SERVER_THREAD_PRIORITY = Integer.getInteger("gale.thread.priority.server", -1); // Gale - server thread priority environment variable
+
private static MinecraftServer SERVER; // Paper
public static final Logger LOGGER = LogUtils.getLogger();
public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
@@ -312,7 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -313,6 +315,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error
atomicreference.set(s0);
- thread.setPriority(Thread.NORM_PRIORITY+2); // Paper - boost priority
+ thread.setPriority(SERVER_THREAD_PRIORITY); // Gale - server thread priority environment variable
+ // Gale start - server thread priority environment variable
+ if (SERVER_THREAD_PRIORITY > 0) {
+ thread.setPriority(SERVER_THREAD_PRIORITY);
+ }
+ // Gale end - server thread priority environment variable
thread.start();
return s0;
}

66
patches/server/0143-Forget-radius-aware-dependency-node-parents.patch
View File

@@ -1,66 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Thu, 10 Aug 2023 21:04:04 +0200
Subject: [PATCH] Forget radius-aware dependency node parents
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/queue/RadiusAwarePrioritisedExecutor.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/queue/RadiusAwarePrioritisedExecutor.java
index 3272f73013ea7d4efdd0ae2903925cc543be7075..7600f98cbfdefbaadf6bef8009b47cb19122a917 100644
--- a/src/main/java/io/papermc/paper/chunk/system/scheduling/queue/RadiusAwarePrioritisedExecutor.java
+++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/queue/RadiusAwarePrioritisedExecutor.java
@@ -223,7 +223,7 @@ public class RadiusAwarePrioritisedExecutor {
// no dependencies, add straight to awaiting
this.awaiting.add(node);
} else {
- node.parents = parents;
+ node.parents = parents.size(); // Gale - forget radius-aware dependency node parents
// we will be added to awaiting once we have no parents
}
}
@@ -296,14 +296,17 @@ public class RadiusAwarePrioritisedExecutor {
if (children != null) {
for (int i = 0, len = children.size(); i < len; ++i) {
final DependencyNode child = children.get(i);
- if (!child.parents.remove(node)) {
- throw new IllegalStateException();
- }
- if (child.parents.isEmpty()) {
+ // Gale start - forget radius-aware dependency node parents
+ int newParents = --child.parents;
+ if (newParents == 0) {
+ // Gale end - forget radius-aware dependency node parents
// no more dependents, we can push to awaiting
- child.parents = null;
// even if the child is purged, we need to push it so that its children will be pushed
this.awaiting.add(child);
+ // Gale start - forget radius-aware dependency node parents
+ } else if (newParents < 0) {
+ throw new IllegalStateException();
+ // Gale end - forget radius-aware dependency node parents
}
}
}
@@ -315,7 +318,7 @@ public class RadiusAwarePrioritisedExecutor {
return ret;
}
- if (ret.parents != null) {
+ if (ret.parents != 0) { // Gale - forget radius-aware dependency node parents
throw new IllegalStateException();
}
@@ -390,8 +393,10 @@ public class RadiusAwarePrioritisedExecutor {
// (must hold lock on the scheduler to use)
// null is the same as empty, we just use it so that we don't allocate the set unless we need to
private List<DependencyNode> children;
- // null is the same as empty, indicating that this task is considered "awaiting"
- private ReferenceOpenHashSet<DependencyNode> parents;
+ // Gale start - forget radius-aware dependency node parents
+ // 0 indicates that this task is considered "awaiting"
+ private int parents;
+ // Gale end - forget radius-aware dependency node parents
// false -> scheduled and not cancelled
// true -> scheduled but cancelled
private boolean purged;

0
patches/server/0144-Instantly-continue-on-world-upgrade-finish.patch → patches/server/0143-Instantly-continue-on-world-upgrade-finish.patch
View File

0
patches/server/0145-Virtual-thread-support.patch → patches/server/0144-Virtual-thread-support.patch
View File