Repo-Mirror/MiraiMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix "Remove VersionFetcher" && upstream

Browse Source 
Still need to fix "Change defaults in YAML config files" patch
This commit is contained in:
Etil
2021-09-27 12:06:39 +02:00
parent f0a89b8607
commit e6b11258fd
51 changed files with 70 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=xyz.arthurb.mirai
version=1.17.1-R0.1-SNAPSHOT
mcVersion=1.17.1
airplaneRef=a434719ed9ed7b624c0e7730f03cc7c349334014
airplaneRef=1afb99c41f545538730acee90ff351d6b0617f49
org.gradle.caching=true
org.gradle.parallel=true

4
patches/api/0003-Sugarcane-Fix-Javadoc-generation.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] (Sugarcane) Fix Javadoc generation
diff --git a/build.gradle.kts b/build.gradle.kts
index 689d470ebe2c7e25e4c87f6127978d1d283e55b5..3c9bdac53115cb6222706b8d72f36a337938e4a0 100644
index 02f80c9a34a23c2285a1e05b41f53b4bafc28c5a..e9b99787cf31bc6e40e5f55dc79ed158b07f0fb6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,6 +85,8 @@ tasks.jar {
@@ -91,6 +91,8 @@ tasks.jar {
tasks.withType<Javadoc>().configureEach {
(options as CoreJavadocOptions).addStringOption("sourcepath", apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath))

37
patches/server/0001-Mirai-Branding-Changes.patch
View File

@@ -1,35 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Fri, 17 Sep 2021 21:07:18 +0200
Date: Mon, 27 Sep 2021 11:58:34 +0200
Subject: [PATCH] Mirai Branding Changes
diff --git a/build.gradle.kts b/build.gradle.kts
index c1e70d5f127804deabcf626b725390863e896d38..79983b971264e8de36bfc547439f8889e2e2a5fe 100644
index e4fdc5d362b8dbef2c8b209678200f147e871db0..2cc2b916a2667d0e04bb7efd13bdb35c112fdc08 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,8 +32,8 @@ repositories {
@@ -32,7 +32,7 @@ repositories {
}
dependencies {
- implementation(project(":Airplane-API")) // Airplane // Paper
- implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane
+ implementation(project(":Mirai-API")) // Mirai // Paper
+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Mirai
+ implementation(project(":Mirai-API")) // Mirai // Airplane // Paper
implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -93,7 +93,7 @@ tasks.jar {
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
"Implementation-Version" to "git-Paper-$implementationVersion",
- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane // Tuinity
+ "Implementation-Version" to "git-Mirai-$implementationVersion", // Mirai
- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane
+ "Implementation-Version" to "git-Mirai-$implementationVersion", // Mirai // Airplane
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..9c01b0b995b5be4812c77fc86ab6094e992f470a 100644
index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..018845c1a96fa4d0411ad12d2260a7d0d6bb5165 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -37,12 +35,12 @@ index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..9c01b0b995b5be4812c77fc86ab6094e
@DontObfuscate
public String getServerModName() {
- return "Airplane"; // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Mirai"; // Mirai // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Mirai"; // Mirai // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
}
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..55ec38f83f97494585aab451e59a8f67841b077b 100644
index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..0c0029fbbf593dea77e98ff309266203d3a221d1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -50,10 +48,23 @@ index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..55ec38f83f97494585aab451e59a8f67
public final class CraftServer implements Server {
- private final String serverName = "Airplane"; // Paper // Airplane
+ private final String serverName = "Mirai"; // Paper // Mirai
+ private final String serverName = "Mirai"; // Paper // Airplane // Mirai
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index efbe385b3a78f4bd0dee6b63d78999513433b79b..2ad9bac4c1ae2adb50bb6291591ff4b741b3007e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -394,7 +394,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
- return new gg.airplane.AirplaneVersionFetcher(); // Airplane
+ return new com.destroystokyo.paper.PaperVersionFetcher(); // Airplane // Mirai - revert VersionFetcher to Paper
}
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 1788d79ea489e446d3d9f541693d4ba3dfc26015..4253c9e1f416bc5fd55ea1e1b4aa54023da9f829 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

6
patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] (Akarin) Swaps the predicate order of collision
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a88ad1035573dd0b35d0140859261229a1df8cf0..8b0882036058e8a07dbecded182112d0e9170f3e 100644
index 7e65ed2a6a4dfa4f22bef5a01a079b8b7cb9e212..7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1854,8 +1854,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -1857,8 +1857,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public void playerTouch(Player player) {}
public void push(Entity entity) {
@@ -18,7 +18,7 @@ index a88ad1035573dd0b35d0140859261229a1df8cf0..8b0882036058e8a07dbecded182112d0
if (this.level.paperConfig.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
double d0 = entity.getX() - this.getX();
double d1 = entity.getZ() - this.getZ();
@@ -1884,7 +1883,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -1887,7 +1886,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
}

4
patches/server/0018-Patina-Remove-unnecessary-LogManager.getLogger.patch → patches/server/0017-Patina-Remove-unnecessary-LogManager.getLogger.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (Patina) Remove unnecessary `LogManager.getLogger()`
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a1f639651c6308c8329f93d1bbfb5dc4706de95d..3c272e6c7552cb5bc875cdaefc91aaac3751ec3a 100644
index 7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482..c07a945d0215297a47f5928e4476615c1f0b8011 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -164,7 +164,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -17,7 +17,7 @@ index a1f639651c6308c8329f93d1bbfb5dc4706de95d..3c272e6c7552cb5bc875cdaefc91aaac
} else {
super.setSeed(seed);
locked = true;
@@ -2317,7 +2317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2320,7 +2320,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
try {
spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName);
} catch (Exception ignored) {

0
patches/server/0019-Patina-Make-a-field-final.patch → patches/server/0018-Patina-Make-a-field-final.patch
View File

8
patches/server/0020-Patina-Don-t-create-new-random-instance.patch → patches/server/0019-Patina-Don-t-create-new-random-instance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (Patina) Don't create new random instance
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0cbbf7ee0ae6a5d4533287c56ed1e711f4ff9c56..d30d7a025cb88da120b3c6b7cb57a4f4d0afe043 100644
index f0250f97d194f1ad98f8f119c80e1b24ee26a2ac..b660c853128e79334f3da8f7334125d240cf0fc6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -647,7 +647,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -18,7 +18,7 @@ index 0cbbf7ee0ae6a5d4533287c56ed1e711f4ff9c56..d30d7a025cb88da120b3c6b7cb57a4f4
dimensionmanager = worlddimension.type();
chunkgenerator = worlddimension.generator();
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6d2d2ba4a83d887f4d52188305a4a28c2ee2f014..c47b064e17a6c527a70c136aaf342195b371241a 100644
index 9e6342ac61bdccfde371674249a5d43c692358eb..fe38270c83555fd2008f9ce873ba2964a283e6a8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -372,7 +372,7 @@ public class ServerPlayer extends Player {
@@ -53,7 +53,7 @@ index 25ae440839f1d286550a77d0a4c61e1dc02b369d..711d5dc2a8b3a5f2a2a35cab59b5ecfd
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 96085df2d6a10a4592455434c52e7919803bd8f4..cce49ce7a8815017c718f0d96ea9b86e607de547 100644
index ae6b32865857cc6e32c468237c25b9baa117842b..66e48492c2cbb4833ffda027332a81b80538d214 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -123,13 +123,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -95,7 +95,7 @@ index 57b12ba5a24e68b0a0420d692946fe5e83974db4..75b00ee813da7447f33ba2a334e96892
if (!s1.isEmpty()) {
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index edb0bcfed9d83c4d7624a28f343dd614e5ab3b3b..2ab24b023ab9b489440f16b184c214f0de9776e2 100644
index 0bfced8a446fbd689680f071599a47c9527eee63..2ff372ebd8b74926c00ae470ddf79ab918036eb1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1173,7 +1173,7 @@ public final class CraftServer implements Server {

0
patches/server/0021-Patina-Completely-remove-bootstrapExecutor.patch → patches/server/0020-Patina-Completely-remove-bootstrapExecutor.patch
View File

0
patches/server/0022-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch → patches/server/0021-Akarin-Avoid-double-I-O-operation-on-load-player-fil.patch
View File

0
patches/server/0023-Logo.patch → patches/server/0022-Logo.patch
View File

4
patches/server/0024-Sugarcane-New-NBT-cache.patch → patches/server/0023-Sugarcane-New-NBT-cache.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (Sugarcane) New NBT cache
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d30d7a025cb88da120b3c6b7cb57a4f4d0afe043..883de715e3a5a1c9335854b7d0d0cfd998f7866f 100644
index b660c853128e79334f3da8f7334125d240cf0fc6..31de069f4a5cee86eb5fa3316a031b85c8f6eb1b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1097,7 +1097,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -19,7 +19,7 @@ index d30d7a025cb88da120b3c6b7cb57a4f4d0afe043..883de715e3a5a1c9335854b7d0d0cfd9
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
MinecraftServer.LOGGER.info("Saving usercache.json");
diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
index 8ce6d386a67687207966a9c577cff9046f45193e..ce80d1d424c195144215cf7bcd7792a889c9d5f8 100644
index 8ce6d386a67687207966a9c577cff9046f45193e..6a7dc4d116056ce55ac3c82d3ab5ff3d74158795 100644
--- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
@@ -24,6 +24,10 @@ public class PlayerDataStorage {

6
patches/server/0025-Sugarcane-Add-last-tick-time-API.patch → patches/server/0024-Sugarcane-Add-last-tick-time-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (Sugarcane) Add last tick time API
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 883de715e3a5a1c9335854b7d0d0cfd998f7866f..5e45bc56256b0ad30e5847ceaac2769ef8bddbc2 100644
index 31de069f4a5cee86eb5fa3316a031b85c8f6eb1b..a1a1aa0f4f30391cf4afb57a743c16aa8f5a4e17 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1210,6 +1210,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -28,7 +28,7 @@ index 883de715e3a5a1c9335854b7d0d0cfd998f7866f..5e45bc56256b0ad30e5847ceaac2769e
this.mayHaveDelayedTasks = true;
this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2ab24b023ab9b489440f16b184c214f0de9776e2..dc29b787ac4bd446f20532536cb587453e6070f8 100644
index 2ff372ebd8b74926c00ae470ddf79ab918036eb1..fb9a857dd119333b49867bb48846679ffa8193e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2669,4 +2669,6 @@ public final class CraftServer implements Server {
@@ -39,7 +39,7 @@ index 2ab24b023ab9b489440f16b184c214f0de9776e2..dc29b787ac4bd446f20532536cb58745
+ @Override public java.time.Duration getLastTickTime() { return net.minecraft.server.MinecraftServer.lastTickTime; } // Sugarcane
}
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 9bede6a26c08ede063c7a38f1149c811df14b258..fdc642ce8d45b5dd9aef02d0adc67913fa38e7e6 100644
index 9bede6a26c08ede063c7a38f1149c811df14b258..82d52acb07ae5d366b8a117c0c9af1041c4f3354 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -32,7 +32,11 @@ public class TicksPerSecondCommand extends Command

2
patches/server/0026-Sugarcane-Add-GameProfileLookupEvent.patch → patches/server/0025-Sugarcane-Add-GameProfileLookupEvent.patch
View File

@@ -30,7 +30,7 @@ index 84551164b76bc8f064a3a0c030c3a1b47f567b6f..5dc4e8e05a4d018f407b20302c270fc0
if (this.profile.isComplete()) {
server.getProfileCache().add(this.profile);
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
index f61c313195c3d16d996721b2f8cd0d9a10ce1aaf..36ed9f56c18dbb320bdb5bfdc57c1f793be4aed6 100644
index f61c313195c3d16d996721b2f8cd0d9a10ce1aaf..4bde462424052b0e9a7bf20d7ca0d861016eaa92 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
@@ -154,7 +154,16 @@ public class SkullBlockEntity extends BlockEntity {

0
patches/server/0027-Sugarcane-Stop-wasting-resources-on-JsonList-get.patch → patches/server/0026-Sugarcane-Stop-wasting-resources-on-JsonList-get.patch
View File

0
patches/server/0028-Yatopia-Global-Eula-file.patch → patches/server/0027-Yatopia-Global-Eula-file.patch
View File

0
patches/server/0029-EMC-Don-t-save-Fireworks.patch → patches/server/0028-EMC-Don-t-save-Fireworks.patch
View File

0
patches/server/0030-EMC-Fix-Give-command.patch → patches/server/0029-EMC-Fix-Give-command.patch
View File

4
patches/server/0031-EMC-Don-t-use-force-unload-for-keep-spawn-setting-ch.patch → patches/server/0030-EMC-Don-t-use-force-unload-for-keep-spawn-setting-ch.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] (EMC) Don't use force unload for keep spawn setting change
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f9df6e9d3d74e25a72abee8b43df21bbc0372409..b03f0224b7867dfb20a0cf71a522119d5cb9e40a 100644
index 883b2070fcf99cf10d44aef6dece0f7f84bfeeed..63f6dd93aa00b8c30478f50bd388fae805b9e3b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -368,7 +368,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -369,7 +369,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunk(int x, int z) {

0
patches/server/0032-EMC-Don-t-trigger-Lootable-Refresh-for-non-player-in.patch → patches/server/0031-EMC-Don-t-trigger-Lootable-Refresh-for-non-player-in.patch
View File

4
patches/server/0033-EMC-Don-t-load-chunks-for-physics.patch → patches/server/0032-EMC-Don-t-load-chunks-for-physics.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] (EMC) Don't load chunks for physics
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index cce49ce7a8815017c718f0d96ea9b86e607de547..3ad9bf45b52a4991f50ed7e9c8392d45212e4947 100644
index 66e48492c2cbb4833ffda027332a81b80538d214..35cf04c0710f831eb6663a66f7de1d05d615adc1 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -898,7 +898,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -914,7 +914,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public void neighborChanged(BlockPos pos, Block sourceBlock, BlockPos neighborPos) {
if (!this.isClientSide) {

2
patches/server/0034-EMC-Do-not-process-chat-commands-before-player-has-j.patch → patches/server/0033-EMC-Do-not-process-chat-commands-before-player-has-j.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (EMC) Do not process chat/commands before player has joined
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 86ff3ee13ac571570965966fc5b2392bb928ffb0..a31e066571b98d18cd6805c4037ebc0cefc1f17f 100644
index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..3312de09e16d4656a2e1c39da6f9f97679541f1f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2056,6 +2056,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

0
patches/server/0035-Jettpack-Use-LinkedBlockingDeque-in-IAsyncTaskHandle.patch → patches/server/0034-Jettpack-Use-LinkedBlockingDeque-in-IAsyncTaskHandle.patch
View File

2
patches/server/0036-Jettpack-Better-handling-of-async-tasks.patch → patches/server/0035-Jettpack-Better-handling-of-async-tasks.patch
View File

@@ -78,7 +78,7 @@ index f9701ef4162868894a81f0d1ac9b58d00d9a2d65..184b23d4a895d8feb57f707b635490d0
public static Runnable once(Runnable run) {
AtomicBoolean ran = new AtomicBoolean(false);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5e45bc56256b0ad30e5847ceaac2769ef8bddbc2..af469197dcb8d81e57f53ff75abbd451942dc1ac 100644
index a1a1aa0f4f30391cf4afb57a743c16aa8f5a4e17..a1d0389f7c6126d0088734f4f7997eb202486b6e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -368,7 +368,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab

0
patches/server/0037-Jettpack-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EX.patch → patches/server/0036-Jettpack-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EX.patch
View File

0
patches/server/0038-Lithium-ai.task.goat_jump.patch → patches/server/0037-Lithium-ai.task.goat_jump.patch
View File

0
patches/server/0039-Lithium-Reduce-allocations.patch → patches/server/0038-Lithium-Reduce-allocations.patch
View File

2
patches/server/0040-Some-modifications-to-the-Snooper-patch.patch → patches/server/0039-Some-modifications-to-the-Snooper-patch.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Some modifications to the Snooper patch
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index af469197dcb8d81e57f53ff75abbd451942dc1ac..76fff7a82c67fe62b090dd5ec5906bc54862eb6d 100644
index a1d0389f7c6126d0088734f4f7997eb202486b6e..c2e170e1fd84796298888e237bc8eb4f98ab1ceb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -120,8 +120,8 @@ import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvi

0
patches/server/0041-Purpur-Fix-cow-rotation-when-shearing-mooshroom.patch → patches/server/0040-Purpur-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

0
patches/server/0042-Purpur-End-gateway-should-check-if-entity-can-use-po.patch → patches/server/0041-Purpur-End-gateway-should-check-if-entity-can-use-po.patch
View File

0
patches/server/0043-Purpur-Arrows-should-not-reset-despawn-counter.patch → patches/server/0042-Purpur-Arrows-should-not-reset-despawn-counter.patch
View File

2
patches/server/0044-Purpur-Spread-out-and-optimise-player-list-ticksSpre.patch → patches/server/0043-Purpur-Spread-out-and-optimise-player-list-ticksSpre.patch
View File

@@ -46,7 +46,7 @@ index e61c9b789583382612b4b0fd56084ebe2e9adbda..694006404be284042991cddd19caab90
public void broadcastAll(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1ccbdd2554073a41ca2f37deca3f1ec3e6a0665f..f477de27ec01a8c28311583f08e164b3d04cf8e1 100644
index 2b8e31ae00e786dfbfbf5bb5228b846752cd2543..6c7cb224229fa3aa64d6cf3b25a2213e31165931 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1565,7 +1565,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

0
patches/server/0045-Purpur-Fix-SPIGOT-6278.patch → patches/server/0044-Purpur-Fix-SPIGOT-6278.patch
View File

0
patches/server/0046-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch → patches/server/0045-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch
View File

0
patches/server/0047-EMC-Bound-villager-trade-maxUses-by-16.patch → patches/server/0046-EMC-Bound-villager-trade-maxUses-by-16.patch
View File

0
patches/server/0048-EMC-Tweak-explosions.patch → patches/server/0047-EMC-Tweak-explosions.patch
View File

0
patches/server/0049-Purpur-Fix-vanilla-command-permission-handler.patch → patches/server/0048-Purpur-Fix-vanilla-command-permission-handler.patch
View File

0
patches/server/0051-Improve-EntityTransformEvent-cancellation-handling.patch → patches/server/0049-Improve-EntityTransformEvent-cancellation-handling.patch
View File

22
patches/server/0050-Fix-mobs-spawning-outside-hard-despawn-range.patch
View File

@@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sun, 26 Sep 2021 12:31:29 +0200
Subject: [PATCH] Fix mobs spawning outside hard despawn range
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index d2a282d9c84952627a0ae1a4b1ff388e39c472c3..51cdbe357c16f9a41745146f8465fd57f498395d 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -398,7 +398,10 @@ public final class NaturalSpawner {
}
private static boolean isValidPositionForMob(ServerLevel world, Mob entity, double squaredDistance) {
- return squaredDistance > (double) (entity.getType().getCategory().getDespawnDistance() * entity.getType().getCategory().getDespawnDistance()) && entity.removeWhenFarAway(squaredDistance) ? false : entity.checkSpawnRules((LevelAccessor) world, MobSpawnType.NATURAL) && entity.checkSpawnObstruction((LevelReader) world);
+ // Mirai start - fix mobs spawning outside hard despawn range
+ int despawnDistance = entity.isPersistenceRequired() || entity.requiresCustomPersistence() ? entity.getType().getCategory().getDespawnDistance() * entity.getType().getCategory().getDespawnDistance() : world.paperConfig.hardDespawnDistance;
+ return squaredDistance > (double) despawnDistance && entity.removeWhenFarAway(squaredDistance) ? false : entity.checkSpawnRules((LevelAccessor) world, MobSpawnType.NATURAL) && entity.checkSpawnObstruction((LevelReader) world);
+ // Mirai end - fix mobs spawning outside hard despawn range
}
private static Optional<MobSpawnSettings.SpawnerData> getRandomSpawnMobAt(ServerLevel world, StructureFeatureManager structureAccessor, ChunkGenerator chunkGenerator, MobCategory spawnGroup, Random random, BlockPos pos) {

8
patches/server/0052-Yatopia-Use-faster-random-implementation.patch → patches/server/0050-Yatopia-Use-faster-random-implementation.patch
View File

@@ -18,7 +18,7 @@ index 20cfe7b9b7127ddeb97aa91d759fc17b4a548eaf..8d4f8de8aa9a9f8194e37b9261ee0819
private long lastFill = -1;
private long nextRefill = -1;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 76fff7a82c67fe62b090dd5ec5906bc54862eb6d..26f2f8cbd0235b22615dbacdea5183b44bfa8d39 100644
index c2e170e1fd84796298888e237bc8eb4f98ab1ceb..1e3185f84c3017a4f756bdf14e397604b74edf4e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -412,7 +412,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -75,7 +75,7 @@ index 3cf32793d7de14cd7b070037896916c542008984..60409c1ece97e1f7b51a7394f048d3e6
final MinecraftServer server;
public final Connection connection;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3c272e6c7552cb5bc875cdaefc91aaac3751ec3a..0ebdf40a10c2760a2810f3bd39bed173a0b8dca5 100644
index c07a945d0215297a47f5928e4476615c1f0b8011..551d5ea47ff8bbffce1affefab3c990fb5c1ac8f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -159,7 +159,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -210,10 +210,10 @@ index 53001f490f374c75e0d44ec75387f4bee6ab8952..6bbd6ee76be340759eafffde2414fbad
private EnderDragon createNewDragon() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b03f0224b7867dfb20a0cf71a522119d5cb9e40a..96e16fbe06c1239b7489ae5fb62c38bca725011c 100644
index 63f6dd93aa00b8c30478f50bd388fae805b9e3b4..36cc407c27a089dd7149899f8c3abef955dd013c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -200,7 +200,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -201,7 +201,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
// Paper end

0
patches/server/0053-Origami-Optimize-inventory-API-item-handling.patch → patches/server/0051-Origami-Optimize-inventory-API-item-handling.patch
View File

0
patches/server/0054-Fix-merchant-inventory-not-closing-on-entity-removal.patch → patches/server/0052-Fix-merchant-inventory-not-closing-on-entity-removal.patch
View File

0
patches/server/0055-Purpur-Disable-outdated-build-check.patch → patches/server/0053-Purpur-Disable-outdated-build-check.patch
View File

0
patches/server/0056-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch → patches/server/0054-Purpur-Fix-outdated-server-showing-in-ping-before-se.patch
View File

0
patches/server/0057-Purpur-Don-t-send-useless-entity-packets.patch → patches/server/0055-Purpur-Don-t-send-useless-entity-packets.patch
View File

0
patches/server/0058-Purpur-Skip-events-if-there-s-no-listeners.patch → patches/server/0056-Purpur-Skip-events-if-there-s-no-listeners.patch
View File

4
patches/server/0059-Purpur-Fix-the-dead-lagging-the-server.patch → patches/server/0057-Purpur-Fix-the-dead-lagging-the-server.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] (Purpur) Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0ebdf40a10c2760a2810f3bd39bed173a0b8dca5..84c5db9f9f6e5d664dfc9c021ae63e18c9e37120 100644
index 551d5ea47ff8bbffce1affefab3c990fb5c1ac8f..b6d3e77b5ea67f9c2a35e37ac35d5f77e8436995 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1768,6 +1768,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -1771,6 +1771,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();

2
patches/server/0060-Purpur-Alternative-Keepalive-Handling.patch → patches/server/0058-Purpur-Alternative-Keepalive-Handling.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] (Purpur) Alternative Keepalive Handling
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a31e066571b98d18cd6805c4037ebc0cefc1f17f..63fd225c449d5ec1e84b4e561b310ae502eb88f4 100644
index 3312de09e16d4656a2e1c39da6f9f97679541f1f..13d270396132edbc1101837a5b4e6631082dec00 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

0
patches/server/0062-Purpur-Logger-settings-suppressing-pointless-logs.patch → patches/server/0059-Purpur-Logger-settings-suppressing-pointless-logs.patch
View File

4
patches/server/0063-Purpur-Add-5-second-tps-average-in-tps.patch → patches/server/0060-Purpur-Add-5-second-tps-average-in-tps.patch
View File

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 26f2f8cbd0235b22615dbacdea5183b44bfa8d39..2c90ab39750096f131f06d7016f76a4344cd0e62 100644
index 1e3185f84c3017a4f756bdf14e397604b74edf4e..b8f55af3e9640ca19662623d0e738f34cc0e71e4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnab
@@ -69,7 +69,7 @@ index 26f2f8cbd0235b22615dbacdea5183b44bfa8d39..2c90ab39750096f131f06d7016f76a43
tickSection = curTime;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d21085ab32ef8c40d30aec81714d65e5e238030b..258793683c78767576e01601cb6e8879f2377df7 100644
index fb9a857dd119333b49867bb48846679ffa8193e1..1c335e6ae94b010bf293400b74b23a6f00a996a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2469,6 +2469,7 @@ public final class CraftServer implements Server {

499
patches/server/0061-Change-defaults-in-YAML-config-files.patch
View File

@@ -1,499 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sun, 26 Sep 2021 16:16:40 +0200
Subject: [PATCH] Change defaults in YAML config files
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index a94be051d8c7aec6fe6bc00e14994c3b493cd28d..f5cbe72c3c43664026eeaf43fe3c109972dafe18 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -203,7 +203,7 @@ public class PaperConfig {
public static String timingsServerName;
private static void timings() {
- boolean timings = getBoolean("timings.enabled", true);
+ boolean timings = getBoolean("timings.enabled", false);
// Airplane start
boolean reallyEnableTimings = getBoolean("timings.really-enabled", false);
if (timings && !reallyEnableTimings) {
@@ -214,11 +214,11 @@ public class PaperConfig {
timings = reallyEnableTimings;
// Airplane end
boolean verboseTimings = getBoolean("timings.verbose", true);
- TimingsManager.url = getString("timings.url", "https://timings.aikar.co/");
+ TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/");
if (!TimingsManager.url.endsWith("/")) {
TimingsManager.url += "/";
}
- TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
+ TimingsManager.privacy = getBoolean("timings.server-name-privacy", true);
TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret", "web-services.token")); // Airplane
if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
@@ -256,9 +256,9 @@ public class PaperConfig {
loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
}
- public static int regionFileCacheSize = 256;
+ public static int regionFileCacheSize = 512;
private static void regionFileCacheSize() {
- regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4);
+ regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 512), 4);
}
public static boolean enablePlayerCollisions = true;
@@ -334,9 +334,9 @@ public class PaperConfig {
}
}
- public static boolean useAlternativeLuckFormula = false;
+ public static boolean useAlternativeLuckFormula = true;
private static void useAlternativeLuckFormula() {
- useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
+ useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", true);
if (useAlternativeLuckFormula) {
Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
}
@@ -385,7 +385,7 @@ public class PaperConfig {
}
}
- public static int maxBookPageSize = 2560;
+ public static int maxBookPageSize = 400;
public static double maxBookTotalSizeMultiplier = 0.98D;
private static void maxBookSize() {
maxBookPageSize = Math.min(8192, getInt("settings.book-size.page-max", maxBookPageSize));
@@ -469,7 +469,7 @@ public class PaperConfig {
allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits);
}
- public static boolean consoleHasAllPermissions = false;
+ public static boolean consoleHasAllPermissions = true;
private static void consoleHasAllPermissions() {
consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
}
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 9a3f75288b1d743a7ec4bfd663c1c2988678d3e6..7add090b1e21f6782fc2c381a34c5fe825e15cf0 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -59,9 +59,9 @@ public class PaperWorldConfig {
piglinsGuardChests = getBoolean("piglins-guard-chests", piglinsGuardChests);
}
- public boolean useEigencraftRedstone = false;
+ public boolean useEigencraftRedstone = true;
private void useEigencraftRedstone() {
- useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false);
+ useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", true);
if (useEigencraftRedstone) {
log("Using Eigencraft redstone algorithm by theosib.");
} else {
@@ -102,7 +102,7 @@ public class PaperWorldConfig {
wanderingTraderSpawnChanceMax = getInt("wandering-trader.spawn-chance-max", wanderingTraderSpawnChanceMax);
}
- public boolean fixClimbingBypassingCrammingRule = false;
+ public boolean fixClimbingBypassingCrammingRule = true;
private void fixClimbingBypassingCrammingRule() {
fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
}
@@ -112,7 +112,7 @@ public class PaperWorldConfig {
fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
}
- public boolean disableMobSpawnerSpawnEggTransformation = false;
+ public boolean disableMobSpawnerSpawnEggTransformation = true;
private void disableMobSpawnerSpawnEggTransformation() {
disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
}
@@ -138,12 +138,24 @@ public class PaperWorldConfig {
public Map<EntityType<?>, Integer> entityPerChunkSaveLimits = new HashMap<>();
private void entityPerChunkSaveLimits() {
- getInt("entity-per-chunk-save-limit.experience_orb", -1);
- getInt("entity-per-chunk-save-limit.snowball", -1);
- getInt("entity-per-chunk-save-limit.ender_pearl", -1);
- getInt("entity-per-chunk-save-limit.arrow", -1);
- getInt("entity-per-chunk-save-limit.fireball", -1);
- getInt("entity-per-chunk-save-limit.small_fireball", -1);
+ getInt("entity-per-chunk-save-limit.experience_orb", 16);
+ getInt("entity-per-chunk-save-limit.arrow", 16);
+ getInt("entity-per-chunk-save-limit.dragon_fireball", 3);
+ getInt("entity-per-chunk-save-limit.egg", 8);
+ getInt("entity-per-chunk-save-limit.ender_pearl", 8);
+ getInt("entity-per-chunk-save-limit.eye_of_ender", 8);
+ getInt("entity-per-chunk-save-limit.fireball", 8);
+ getInt("entity-per-chunk-save-limit.small_fireball", 8);
+ getInt("entity-per-chunk-save-limit.firework_rocket", 8);
+ getInt("entity-per-chunk-save-limit.potion", 8);
+ getInt("entity-per-chunk-save-limit.llama_spit", 3);
+ getInt("entity-per-chunk-save-limit.shulker_bullet", 8);
+ getInt("entity-per-chunk-save-limit.snowball", 8);
+ getInt("entity-per-chunk-save-limit.spectral_arrow", 16);
+ getInt("entity-per-chunk-save-limit.experience_bottle", 3);
+ getInt("entity-per-chunk-save-limit.trident", 16);
+ getInt("entity-per-chunk-save-limit.wither_skull", 4);
+ getInt("entity-per-chunk-save-limit.area_effect_cloud", 8);
addEntityPerChunkSaveLimitsFromSection(config.getConfigurationSection("world-settings.default.entity-per-chunk-save-limit"), entityPerChunkSaveLimits);
addEntityPerChunkSaveLimitsFromSection(config.getConfigurationSection("world-settings." + worldName + ".entity-per-chunk-save-limit"), entityPerChunkSaveLimits);
@@ -174,9 +186,9 @@ public class PaperWorldConfig {
log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
}
- public int autoSavePeriod = -1;
+ public int autoSavePeriod = 6000;
private void autoSavePeriod() {
- autoSavePeriod = getInt("auto-save-interval", -1);
+ autoSavePeriod = getInt("auto-save-interval", 6000);
if (autoSavePeriod > 0) {
log("Auto Save Interval: " +autoSavePeriod + " (" + (autoSavePeriod / 20) + "s)");
} else if (autoSavePeriod < 0) {
@@ -263,13 +275,13 @@ public class PaperWorldConfig {
public boolean nerfedMobsShouldJump;
private void nerfedMobsShouldJump() {
- nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
+ nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", true);
}
public int softDespawnDistance;
public int hardDespawnDistance;
private void despawnDistances() {
- softDespawnDistance = getInt("despawn-ranges.soft", 32); // 32^2 = 1024, Minecraft Default
+ softDespawnDistance = getInt("despawn-ranges.soft", 28); // 32^2 = 1024, Minecraft Default
hardDespawnDistance = getInt("despawn-ranges.hard", 128); // 128^2 = 16384, Minecraft Default
if (softDespawnDistance > hardDespawnDistance) {
@@ -327,7 +339,7 @@ public class PaperWorldConfig {
public boolean optimizeExplosions;
private void optimizeExplosions() {
- optimizeExplosions = getBoolean("optimize-explosions", false);
+ optimizeExplosions = getBoolean("optimize-explosions", true);
log("Optimize explosions: " + optimizeExplosions);
}
@@ -348,17 +360,17 @@ public class PaperWorldConfig {
public int mobSpawnerTickRate;
private void mobSpawnerTickRate() {
- mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
+ mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 2);
}
public int containerUpdateTickRate;
private void containerUpdateTickRate() {
- containerUpdateTickRate = getInt("container-update-tick-rate", 1);
+ containerUpdateTickRate = getInt("container-update-tick-rate", 3);
}
public boolean disableChestCatDetection;
private void disableChestCatDetection() {
- disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
+ disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", true);
}
public boolean disablePlayerCrits;
@@ -390,14 +402,14 @@ public class PaperWorldConfig {
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
}
- public int nonPlayerArrowDespawnRate = -1;
- public int creativeArrowDespawnRate = -1;
+ public int nonPlayerArrowDespawnRate = 20;
+ public int creativeArrowDespawnRate = 20;
private void nonPlayerArrowDespawnRate() {
- nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
+ nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", 20);
if (nonPlayerArrowDespawnRate == -1) {
nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
}
- creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1);
+ creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", 20);
if (creativeArrowDespawnRate == -1) {
creativeArrowDespawnRate = spigotConfig.arrowDespawnRate;
}
@@ -423,7 +435,7 @@ public class PaperWorldConfig {
fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
}
- public int grassUpdateRate = 1;
+ public int grassUpdateRate = 4;
private void grassUpdateRate() {
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
log("Grass Spread Tick Rate: " + grassUpdateRate);
@@ -500,7 +512,7 @@ public class PaperWorldConfig {
}
public boolean seedBasedFeatureSearch = true;
- public boolean seedBasedFeatureSearchLoadsChunks = true;
+ public boolean seedBasedFeatureSearchLoadsChunks = false;
private void seedBasedFeatureSearch() {
seedBasedFeatureSearch = getBoolean("seed-based-feature-search", seedBasedFeatureSearch);
seedBasedFeatureSearchLoadsChunks = getBoolean("seed-based-feature-search-loads-chunks", seedBasedFeatureSearchLoadsChunks);
@@ -509,7 +521,7 @@ public class PaperWorldConfig {
public int maxCollisionsPerEntity;
private void maxEntityCollision() {
- maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
+ maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 2) );
log( "Max Entity Collisions: " + maxCollisionsPerEntity );
}
@@ -565,17 +577,17 @@ public class PaperWorldConfig {
scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
}
- public boolean ironGolemsCanSpawnInAir = false;
+ public boolean ironGolemsCanSpawnInAir = true;
private void ironGolemsCanSpawnInAir() {
ironGolemsCanSpawnInAir = getBoolean("iron-golems-can-spawn-in-air", ironGolemsCanSpawnInAir);
}
- public boolean armorStandEntityLookups = true;
+ public boolean armorStandEntityLookups = false;
private void armorStandEntityLookups() {
- armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", false);
}
- public boolean armorStandTick = true;
+ public boolean armorStandTick = false;
private void armorStandTick() {
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
@@ -587,9 +599,9 @@ public class PaperWorldConfig {
log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
}
- public boolean preventMovingIntoUnloadedChunks = false;
+ public boolean preventMovingIntoUnloadedChunks = true;
private void preventMovingIntoUnloadedChunks() {
- preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
+ preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", true);
}
public enum DuplicateUUIDMode {
@@ -738,7 +750,7 @@ public class PaperWorldConfig {
public long delayChunkUnloadsBy;
private void delayChunkUnloadsBy() {
- delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "10s"));
+ delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "5s"));
if (delayChunkUnloadsBy > 0) {
log("Delaying chunk unloads by " + delayChunkUnloadsBy + " seconds");
delayChunkUnloadsBy *= 20;
@@ -841,14 +853,14 @@ public class PaperWorldConfig {
enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
}
- public boolean updatePathfindingOnBlockUpdate = true;
+ public boolean updatePathfindingOnBlockUpdate = false;
private void setUpdatePathfindingOnBlockUpdate() {
updatePathfindingOnBlockUpdate = getBoolean("update-pathfinding-on-block-update", this.updatePathfindingOnBlockUpdate);
}
- public boolean fixWitherTargetingBug = false;
+ public boolean fixWitherTargetingBug = true;
private void witherSettings() {
- fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", false);
+ fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", true);
log("Withers properly target players: " + fixWitherTargetingBug);
}
@@ -890,8 +902,13 @@ public class PaperWorldConfig {
private Table<String, String, Integer> sensorTickRates;
private Table<String, String, Integer> behaviorTickRates;
private void tickRates() {
- config.addDefault("world-settings.default.tick-rates.sensor.villager.secondarypoisensor", 40);
- config.addDefault("world-settings.default.tick-rates.behavior.villager.validatenearbypoi", -1); // Example
+ config.addDefault("world-settings.default.tick-rates.sensor.villager.secondarypoisensor", 80);
+ config.addDefault("world-settings.default.tick-rates.sensor.villager.nearestbedsensor", 80);
+ config.addDefault("world-settings.default.tick-rates.sensor.villager.villagerbabiessensor", 40);
+ config.addDefault("world-settings.default.tick-rates.sensor.villager.playersensor", 40);
+ config.addDefault("world-settings.default.tick-rates.sensor.villager.nearestlivingentitysensor", 40);
+ config.addDefault("world-settings.default.tick-rates.behavior.villager.validatenearbypoi", 60);
+ config.addDefault("world-settings.default.tick-rates.behavior.villager.acquirepoi", 120);
log("Tick rates:");
sensorTickRates = loadTickRates("sensor");
behaviorTickRates = loadTickRates("behavior");
@@ -930,7 +947,7 @@ public class PaperWorldConfig {
public it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<net.minecraft.resources.ResourceLocation> featureSeeds = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
private void featureSeeds() {
featureSeeds.defaultReturnValue(-1);
- final boolean randomise = getBoolean("feature-seeds.generate-random-seeds-for-all", false);
+ final boolean randomise = getBoolean("feature-seeds.generate-random-seeds-for-all", true);
final ConfigurationSection defaultSection = config.getConfigurationSection("world-settings.default.feature-seeds");
final ConfigurationSection section = config.getConfigurationSection("world-settings." + worldName + ".feature-seeds");
final net.minecraft.core.Registry<net.minecraft.world.level.levelgen.feature.ConfiguredFeature<?, ?>> registry
diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java
index 2b654e6adfe331a5fa68c1aea7d6d6cea1f3567d..49a881603d8589e0682264146c233161ea06532c 100644
--- a/src/main/java/gg/airplane/AirplaneConfig.java
+++ b/src/main/java/gg/airplane/AirplaneConfig.java
@@ -179,7 +179,7 @@ public class AirplaneConfig {
private static void projectileLoading() {
maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
- maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
+ maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 8, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
setComment("projectile", "Optimizes projectile settings");
}
@@ -197,10 +197,10 @@ public class AirplaneConfig {
"This value determines how far away an entity has to be",
"from the player to start being effected by DEAR.");
startDistanceSquared = startDistance * startDistance;
- maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
+ maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 30,
"This value defines how often in ticks, the furthest entity",
"will get their pathfinders and behaviors ticked. 20 = 1s");
- activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 8,
+ activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 7,
"This value defines how much distance modifies an entity's",
"tick frequency. freq = (distanceToPlayer^2) / (2^value)",
"If you want further away entities to tick less often, use 7.",
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index dc29b787ac4bd446f20532536cb587453e6070f8..d21085ab32ef8c40d30aec81714d65e5e238030b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -903,25 +903,25 @@ public final class CraftServer implements Server {
}
if (this.getTicksPerMonsterSpawns() < 0) {
- world.ticksPerMonsterSpawns = 1;
+ world.ticksPerMonsterSpawns = 10;
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
if (this.getTicksPerWaterSpawns() < 0) {
- world.ticksPerWaterSpawns = 1;
+ world.ticksPerWaterSpawns = 400;
} else {
world.ticksPerWaterSpawns = this.getTicksPerWaterSpawns();
}
if (this.getTicksPerWaterAmbientSpawns() < 0) {
- world.ticksPerWaterAmbientSpawns = 1;
+ world.ticksPerWaterAmbientSpawns = 400;
} else {
world.ticksPerWaterAmbientSpawns = this.getTicksPerWaterAmbientSpawns();
}
if (this.getTicksPerAmbientSpawns() < 0) {
- world.ticksPerAmbientSpawns = 1;
+ world.ticksPerAmbientSpawns = 400;
} else {
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6f67770af753c26a7584f3d6cb85a2a3a00abca2..31523e311fe1fa771792e79a64d4e075a93868ca 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -335,7 +335,7 @@ public class SpigotConfig
public static boolean saveUserCacheOnStopOnly;
private static void saveUserCacheOnStopOnly()
{
- SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", false );
+ SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", true );
}
public static double movedWronglyThreshold;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index c931a46650ba4857805bbfa126c75a9b86b1d707..57541cc5ae56fc6c7f4a1ca4dd986569f9e0a590 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -132,14 +132,14 @@ public class SpigotWorldConfig
public double itemMerge;
private void itemMerge()
{
- this.itemMerge = this.getDouble("merge-radius.item", 2.5 );
+ this.itemMerge = this.getDouble("merge-radius.item", 4.0 );
this.log( "Item Merge Radius: " + this.itemMerge );
}
public double expMerge;
private void expMerge()
{
- this.expMerge = this.getDouble("merge-radius.exp", 3.0 );
+ this.expMerge = this.getDouble("merge-radius.exp", 6.0 );
this.log( "Experience Merge Radius: " + this.expMerge );
}
@@ -165,7 +165,7 @@ public class SpigotWorldConfig
public byte mobSpawnRange;
private void mobSpawnRange()
{
- this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla
+ this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 2 ); // Paper - Vanilla
this.log( "Mob Spawn Range: " + this.mobSpawnRange );
}
@@ -176,31 +176,31 @@ public class SpigotWorldConfig
this.log( "Item Despawn Rate: " + this.itemDespawnRate );
}
- public int animalActivationRange = 32;
- public int monsterActivationRange = 32;
+ public int animalActivationRange = 16;
+ public int monsterActivationRange = 24;
public int raiderActivationRange = 48;
- public int miscActivationRange = 16;
+ public int miscActivationRange = 8;
// Paper start
public int flyingMonsterActivationRange = 32;
- public int waterActivationRange = 16;
- public int villagerActivationRange = 32;
- public int wakeUpInactiveAnimals = 4;
+ public int waterActivationRange = 8;
+ public int villagerActivationRange = 16;
+ public int wakeUpInactiveAnimals = 2;
public int wakeUpInactiveAnimalsEvery = 60*20;
- public int wakeUpInactiveAnimalsFor = 5*20;
- public int wakeUpInactiveMonsters = 8;
+ public int wakeUpInactiveAnimalsFor = 2*20;
+ public int wakeUpInactiveMonsters = 4;
public int wakeUpInactiveMonstersEvery = 20*20;
- public int wakeUpInactiveMonstersFor = 5*20;
- public int wakeUpInactiveVillagers = 4;
+ public int wakeUpInactiveMonstersFor = 3*20;
+ public int wakeUpInactiveVillagers = 1;
public int wakeUpInactiveVillagersEvery = 30*20;
- public int wakeUpInactiveVillagersFor = 5*20;
- public int wakeUpInactiveFlying = 8;
+ public int wakeUpInactiveVillagersFor = 1*20;
+ public int wakeUpInactiveFlying = 1;
public int wakeUpInactiveFlyingEvery = 10*20;
- public int wakeUpInactiveFlyingFor = 5*20;
+ public int wakeUpInactiveFlyingFor = 3*20;
public int villagersWorkImmunityAfter = 5*20;
public int villagersWorkImmunityFor = 20;
public boolean villagersActiveForPanic = true;
// Paper end
- public boolean tickInactiveVillagers = true;
+ public boolean tickInactiveVillagers = false;
private void activationRange()
{
boolean hasAnimalsConfig = config.getInt("entity-activation-range.animals", this.animalActivationRange) != this.animalActivationRange; // Paper
@@ -272,7 +272,7 @@ public class SpigotWorldConfig
public int tridentDespawnRate;
private void arrowDespawnRate()
{
- this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 );
+ this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 300 );
this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate );
this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate );
}
@@ -401,8 +401,8 @@ public class SpigotWorldConfig
public int entityMaxTickTime;
private void maxTickTimes()
{
- this.tileMaxTickTime = this.getInt("max-tick-time.tile", 50);
- this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50);
+ this.tileMaxTickTime = this.getInt("max-tick-time.tile", 1000);
+ this.entityMaxTickTime = this.getInt("max-tick-time.entity", 1000);
this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms");
}

22
patches/server/0017-Patina-Remove-VersionFetcher.patch → patches/server/0061-Patina-Remove-VersionFetcher.patch
View File

@@ -1,12 +1,12 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sun, 19 Sep 2021 11:17:16 +0200
Date: Mon, 27 Sep 2021 12:04:35 +0200
Subject: [PATCH] (Patina) Remove VersionFetcher
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
deleted file mode 100644
index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..0000000000000000000000000000000000000000
index 580bae0d414d371a07a6bfeefc41fdd989dc0083..0000000000000000000000000000000000000000
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ /dev/null
@@ -1,142 +0,0 @@
@@ -41,8 +41,8 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000
- @Nonnull
- @Override
- public Component getVersionMessage(@Nonnull String serverVersion) {
- String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Tuinity
- final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Tuinity
- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
- final Component history = getHistory();
-
- return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
@@ -66,13 +66,13 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000
-
- private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
- int distance;
- //try {
- // int jenkinsBuild = Integer.parseInt(versionInfo);
- // distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
- //} catch (NumberFormatException ignored) {
- try {
- int jenkinsBuild = Integer.parseInt(versionInfo);
- distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
- } catch (NumberFormatException ignored) {
- versionInfo = versionInfo.replace("\"", "");
- distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
- //}
- }
-
- switch (distance) {
- case -1:
@@ -153,7 +153,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..fe059446a2860d52865c6db15ddd162ad69b0e38 100644
index 2ad9bac4c1ae2adb50bb6291591ff4b741b3007e..dbbbe1ede16399ba32dc7f912f43c137c9fb2779 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -392,10 +392,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -164,7 +164,7 @@ index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..fe059446a2860d52865c6db15ddd162a
+ /* // Patina
+ @Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
return new com.destroystokyo.paper.PaperVersionFetcher();
return new com.destroystokyo.paper.PaperVersionFetcher(); // Airplane // Mirai - revert VersionFetcher to Paper
}
+ */