Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

15/42 patches done

Browse Source
This commit is contained in:
NONPLAYT
2024-05-09 00:50:39 +03:00
parent 4e1497d616
commit 067d8a8d9f
15 changed files with 105 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/unapplied/server/0007-Fix-entity-serialization.patch → patches/removed/1.20/server/0007-Fix-entity-serialization.patch
View File

156
patches/unapplied/server/0002-Divine-Configuration.patch → patches/server/0002-Divine-Configuration.patch
View File

@@ -3,49 +3,22 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Mon, 27 Mar 2023 13:16:41 +0300
Subject: [PATCH] Divine Configuration
This is modified config file by PurpurMC
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5ca6af93362d205438f8321ee2461ae7f8160df1..41cffa00d4978f46b47ac6ede2da2a256796a0ba 100644
index 775c5de4f5094260096cef6723dd50dfe2cb0c81..dac7739c495a81fb71dd9e2e7e14e89b23a74938 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -1,20 +1,15 @@
package net.minecraft.server.dedicated;
@@ -56,6 +56,7 @@ import net.minecraft.world.level.GameType;
import net.minecraft.world.level.block.entity.SkullBlockEntity;
import net.minecraft.world.level.storage.LevelStorageSource;
import org.slf4j.Logger;
+import space.bxteam.divinemc.configuration.DivineConfig; // DivineMC
-import com.google.common.collect.Lists;
import com.mojang.authlib.GameProfile;
import com.mojang.datafixers.DataFixer;
import com.mojang.logging.LogUtils;
-import java.io.BufferedReader;
+
import java.io.BufferedWriter;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.Proxy;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.function.BooleanSupplier;
@@ -58,10 +53,10 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.io.IoBuilder;
import org.bukkit.command.CommandSender;
-import co.aikar.timings.MinecraftTimings; // Paper
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable; // Paper
import org.bukkit.event.server.RemoteServerCommandEvent;
+import space.bxteam.divinemc.configuration.DivineConfig;
// CraftBukkit end
public class DedicatedServer extends MinecraftServer implements ServerInterface {
@@ -235,6 +230,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
// CraftBukkit start
import net.minecraft.server.WorldLoader;
@@ -245,6 +246,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ // DivineMC start
+ try {
@@ -61,64 +34,18 @@ index 5ca6af93362d205438f8321ee2461ae7f8160df1..41cffa00d4978f46b47ac6ede2da2a25
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index eebe6378de52e780aabfad3c414564349196ec6e..7dc96d5fd30dc17af23157dedab4edb7caa7551e 100644
index eda2f8cc034cf46293be1be117a60cf8b663c303..6a3c349cb36a0c89747cf4665e7bc272d6c59365 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -10,9 +10,10 @@ import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import javax.annotation.Nullable;
+
+import space.bxteam.divinemc.configuration.DivineWorldConfig;
import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Holder;
@@ -26,14 +27,12 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
-import io.papermc.paper.util.MCUtil;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.FullChunkStatus;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.AbortableIterationConsumer;
import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource;
import net.minecraft.util.profiling.ProfilerFiller;
@@ -42,8 +41,6 @@ import net.minecraft.world.TickRateManager;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageSources;
import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.boss.EnderDragonPart;
-import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
@@ -89,17 +86,14 @@ import net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDelayPacket;
import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDistancePacket;
import org.bukkit.Bukkit;
-import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CapturedBlockState;
import org.bukkit.craftbukkit.block.CraftBlockState;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.util.CraftSpawnCategory;
-import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.entity.SpawnCategory;
import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.world.GenericGameEvent;
// CraftBukkit end
@@ -81,6 +81,7 @@ import net.minecraft.world.level.storage.WritableLevelData;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.scores.Scoreboard;
+import space.bxteam.divinemc.configuration.DivineWorldConfig; // DivineMC
public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -174,6 +168,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// CraftBukkit start
import java.util.HashMap;
@@ -171,6 +172,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
@@ -126,7 +53,7 @@ index eebe6378de52e780aabfad3c414564349196ec6e..7dc96d5fd30dc17af23157dedab4edb7
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -266,6 +261,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -261,6 +263,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
@@ -135,26 +62,19 @@ index eebe6378de52e780aabfad3c414564349196ec6e..7dc96d5fd30dc17af23157dedab4edb7
this.generator = gen;
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 3580f6a555991702956b4dafc8ab9474817c6d94..1e3c4131e9dd155e4a0830d4c3f76f7f93146fff 100644
index 49188db90fb214d097a349591a5903aa1bc7c931..8d75e43d1c0d8a65ebbf146dcccd23509c236540 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -14,6 +14,7 @@ import com.mojang.brigadier.tree.CommandNode;
import com.mojang.brigadier.tree.LiteralCommandNode;
import com.mojang.serialization.Dynamic;
import com.mojang.serialization.Lifecycle;
+import space.bxteam.divinemc.configuration.DivineConfig;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
@@ -245,7 +246,6 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.ServicesManager;
import org.bukkit.plugin.SimplePluginManager;
import org.bukkit.plugin.SimpleServicesManager;
-import org.bukkit.plugin.java.JavaPluginLoader;
import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.potion.Potion;
@@ -1069,6 +1069,7 @@ public final class CraftServer implements Server {
@@ -267,6 +267,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
+import space.bxteam.divinemc.configuration.DivineConfig; // DivineMC
+
public final class CraftServer implements Server {
private final String serverName = "DivineMC"; // Paper // Pufferfish // Purpur // DivineMC
private final String serverVersion;
@@ -1069,6 +1071,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -162,7 +82,7 @@ index 3580f6a555991702956b4dafc8ab9474817c6d94..1e3c4131e9dd155e4a0830d4c3f76f7f
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))
@@ -1085,6 +1086,7 @@ public final class CraftServer implements Server {
@@ -1085,6 +1088,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur
@@ -170,7 +90,7 @@ index 3580f6a555991702956b4dafc8ab9474817c6d94..1e3c4131e9dd155e4a0830d4c3f76f7f
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1101,6 +1103,7 @@ public final class CraftServer implements Server {
@@ -1101,6 +1105,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -178,7 +98,7 @@ index 3580f6a555991702956b4dafc8ab9474817c6d94..1e3c4131e9dd155e4a0830d4c3f76f7f
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3111,6 +3114,13 @@ public final class CraftServer implements Server {
@@ -3126,6 +3131,13 @@ public final class CraftServer implements Server {
}
// Purpur end
@@ -193,11 +113,11 @@ index 3580f6a555991702956b4dafc8ab9474817c6d94..1e3c4131e9dd155e4a0830d4c3f76f7f
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 146f229b8e8888e2c0256c007c71c675c27e71a5..95da71042ee22db18116860bd9a629ff4b0c81ad 100644
index a0a7bfe8f5a40b945b83096de1efd650adeb9ee3..248405f9c0290b16a580d16bc3cb824cc9f53bc2 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -188,6 +188,14 @@ public class Main {
.describedAs("Yml file");
@@ -183,6 +183,14 @@ public class Main {
.describedAs("Yml file");
// Purpur end
+ // DivineMC start

4
patches/unapplied/server/0003-Fix-MC-98160-and-MC-105103.patch → patches/server/0003-Fix-MC-98160-and-MC-105103.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-98160 and MC-105103
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
index 7e9c88efd2a1edea673d1ef81635c2891a04d30e..26475c2d69537053a041ec9c2f8147842848a8fc 100644
index 105e2b7d7cd7c64a9164e4114476e44f29433f49..13e1c7594bf304b35ce8dcab2951329c527d7dea 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
@@ -862,7 +862,7 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
@@ -859,7 +859,7 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
if (!this.isPassenger()) {
if (onGround) {
if (this.fallDistance > 3.0F) {

34
patches/unapplied/server/0004-Optimize-default-values-for-configs.patch → patches/server/0004-Optimize-default-values-for-configs.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 30fe1c0645a07d663b08c0f988a1ab3a750bf7c4..f8ceb440d402044f3b5e7925981029c893d8c17f 100644
index 2874bc3001c4e7d9191e47ba512c5a68369c21f1..d02d22b09430b93349d48bcb50d456d23f9b49c7 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -96,9 +96,11 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -23,7 +23,7 @@ index 30fe1c0645a07d663b08c0f988a1ab3a750bf7c4..f8ceb440d402044f3b5e7925981029c8
public boolean serverNamePrivacy = false;
public List<String> hiddenConfigEntries = List.of(
"database",
@@ -330,9 +332,9 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -328,9 +330,9 @@ public class GlobalConfiguration extends ConfigurationPart {
public boolean fixEntityPositionDesync = true;
public boolean loadPermissionsYmlBeforePlugins = true;
@Constraints.Min(4)
@@ -36,10 +36,10 @@ index 30fe1c0645a07d663b08c0f988a1ab3a750bf7c4..f8ceb440d402044f3b5e7925981029c8
public boolean strictAdvancementDimensionCheck = false;
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6094dedb4 100644
index efc91ff91827872c62b8bd060282549ccdcf67dd..2b3075505f09c15cee350b7a7f5e7571600a930a 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -150,9 +150,9 @@ public class WorldConfiguration extends ConfigurationPart {
public ArmorStands armorStands;
@@ -52,7 +52,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
}
public Markers markers;
@@ -253,8 +253,8 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -252,8 +252,8 @@ public class WorldConfiguration extends ConfigurationPart {
public Behavior behavior;
public class Behavior extends ConfigurationPart {
@@ -63,7 +63,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
public int experienceMergeMaxValue = -1;
public boolean shouldRemoveDragon = false;
public boolean zombiesTargetTurtleEggs = true;
@@ -278,7 +278,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -277,7 +277,7 @@ public class WorldConfiguration extends ConfigurationPart {
public int playerInsomniaStartTicks = 72000;
public int phantomsSpawnAttemptMinSeconds = 60;
public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -72,7 +72,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
@BelowZeroToEmpty
public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT;
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
@@ -289,7 +289,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -288,7 +288,7 @@ public class WorldConfiguration extends ConfigurationPart {
}
public boolean disablePlayerCrits = false;
@@ -81,7 +81,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
public PillagerPatrols pillagerPatrols;
public class PillagerPatrols extends ConfigurationPart {
@@ -383,7 +383,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -382,7 +382,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Environment extends ConfigurationPart {
public boolean disableThunder = false;
public boolean disableIceAndSnow = false;
@@ -90,7 +90,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
public boolean disableExplosionKnockback = false;
public boolean generateFlatBedrock = false;
public FrostedIce frostedIce;
@@ -432,7 +432,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -428,7 +428,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Maps extends ConfigurationPart {
public int itemFrameCursorLimit = 128;
@@ -99,7 +99,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
}
public Fixes fixes;
@@ -458,7 +458,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -454,7 +454,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Hopper extends ConfigurationPart {
public boolean cooldownWhenFull = true;
public boolean disableMoveEvent = false;
@@ -108,7 +108,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
}
public Collisions collisions;
@@ -466,9 +466,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -462,9 +462,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Collisions extends ConfigurationPart {
public boolean onlyPlayersCollide = false;
public boolean allowVehicleCollisions = true;
@@ -120,7 +120,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
public boolean allowPlayerCrammingDamage = false;
}
@@ -476,18 +476,31 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -472,18 +472,31 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -162,7 +162,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
});
public boolean flushRegionsOnSave = false;
}
@@ -502,13 +515,15 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -498,13 +511,15 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates;
public class TickRates extends ConfigurationPart {
@@ -183,7 +183,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
}
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -517,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -513,7 +528,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart {
@SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
@Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -192,7 +192,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
@Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -538,9 +553,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -534,9 +549,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart {
public int lightQueueSize = 20;
@@ -205,7 +205,7 @@ index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6
public float maxLeashDistance = 10f;
public boolean disableSprintInterruptionOnAttack = false;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 486f69a94f3a5dfd1b13a74fcf780ff8f9ab37ba..fe4c1659f0ca111db8a6d2d6b06d1783872705d6 100644
index bcdd2bc6ffc91349ac75833bd3928e8ca7de7a0f..a5dec9d6858fc19d6877a8ae93e51dcbccabd635 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -241,7 +241,7 @@ public class PurpurConfig {
@@ -218,7 +218,7 @@ index 486f69a94f3a5dfd1b13a74fcf780ff8f9ab37ba..fe4c1659f0ca111db8a6d2d6b06d1783
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6c260403d91d640da0473a3df56e1c5582459fde..252ff4c68e8c2ce4076ce02b4a89ca8eefddba7f 100644
index 6c2a3813e7d63d57f07a8fa2edbb9d231221d818..44ef1545f8e5a2d0785c139da48d7086922cf308 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -335,7 +335,7 @@ public class SpigotConfig

52
patches/unapplied/server/0005-Add-missing-purpur-config-options.patch → patches/server/0005-Add-missing-purpur-config-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur config options
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index c783ce59ea766e6c46a3313628b961f27e01ee8b..4f6b6967f7f632752fcc4faac47dca51cfac1b79 100644
index bca7b7192debb3a34a08047010a2438e7b7e2a78..a0f42a43aeeebfefcf735b29edf7ee17b104c4be 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -152,6 +152,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -33,10 +33,10 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..4f6b6967f7f632752fcc4faac47dca51
protected Brain.Provider<Allay> brainProvider() {
return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 8616a8c09a21f576a07daaa93ebf64e0f03d0c88..6725e22ef763b3cd374ff38f5f36ad6ef97c8a19 100644
index 24a1663cf1cd3f888981a13907811b55bdbf6133..de9fdcb18fa29537d849179b3d52bed083614a4d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -99,6 +99,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
}
// Purpur end
@@ -56,10 +56,10 @@ index 8616a8c09a21f576a07daaa93ebf64e0f03d0c88..6725e22ef763b3cd374ff38f5f36ad6e
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index 37f1d3c656997906cef57d9dbefc226d04fc65fe..8935f17cb02ab8d38e6269608e97e0cb18b0b051 100644
index ee8c232ddaa518377bdfa54e83ffc04f7a2f2c9a..84c6a786658b16fe0535b4d99135ba58cec8d3a9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -167,6 +167,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -166,6 +166,23 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
return this.level().purpurConfig.frogBreedingTicks;
}
@@ -84,10 +84,10 @@ index 37f1d3c656997906cef57d9dbefc226d04fc65fe..8935f17cb02ab8d38e6269608e97e0cb
protected Brain.Provider<Frog> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..b12b79765301782202abfe6b6da2b279a015e927 100644
index 09c4cf772df4644413e40055fedcdf42ee8064fd..327c4ae37b129d3d632f07d763f2d66724d90110 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -92,6 +92,23 @@ public class Tadpole extends AbstractFish {
@@ -95,6 +95,23 @@ public class Tadpole extends AbstractFish {
}
// Purpur end
@@ -112,12 +112,12 @@ index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..b12b79765301782202abfe6b6da2b279
protected PathNavigation createNavigation(Level world) {
return new WaterBoundPathNavigation(this, world);
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..459ea45bcd23ea55da6e561216eb664f97cacfa5 100644
index 21bdcbd51d9f440e0734750b40cefa4c08cdaf5f..3c78fc494d882cf6c790e85963c6ebe21cfa7a9a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -118,6 +118,18 @@ public class Sniffer extends Animal {
return this.level().purpurConfig.snifferBreedingTicks;
@@ -121,6 +121,18 @@ public class Sniffer extends Animal {
}
// Purpur end
+ // DivineMC start - Add missing purpur config options
+ @Override
@@ -131,11 +131,11 @@ index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..459ea45bcd23ea55da6e561216eb664f
+ }
+ // DivineMC end
+
// CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
@Override
protected void defineSynchedData() {
protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder);
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
index bf7ef72a7d92db8f11789a69583270644de0dac7..1bcdee570baf1499d660d019cf03b66dd4d05195 100644
index 0bb577ec9ba0d23a741ccf067ac35f6be68312ca..68b533cdaa53af2d76e9b8ab050dc335bc733794 100644
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
@@ -149,6 +149,23 @@ public class Warden extends Monster implements VibrationSystem {
@@ -163,10 +163,10 @@ index bf7ef72a7d92db8f11789a69583270644de0dac7..1bcdee570baf1499d660d019cf03b66d
public Packet<ClientGamePacketListener> getAddEntityPacket() {
return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
index 58af87b8faf4f8d6bdb111c49a429466acface68..bbadae5873db4b49273b054c1921a401f119fc3a 100644
index b04f7ce0805453f6c737fa9dc11c4129ca64e934..f36e20da4172e2128267cb37123dcf4105144fde 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
@@ -32,6 +32,9 @@ import org.bukkit.entity.HumanEntity;
@@ -34,6 +34,9 @@ import org.bukkit.entity.HumanEntity;
import org.bukkit.event.entity.EntityRemoveEvent;
import org.bukkit.inventory.InventoryHolder;
// CraftBukkit end
@@ -176,7 +176,7 @@ index 58af87b8faf4f8d6bdb111c49a429466acface68..bbadae5873db4b49273b054c1921a401
public class ChestBoat extends Boat implements HasCustomInventoryScreen, ContainerEntity {
@@ -43,7 +46,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@@ -45,7 +48,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
public ChestBoat(EntityType<? extends Boat> type, Level world) {
super(type, world);
@@ -185,7 +185,7 @@ index 58af87b8faf4f8d6bdb111c49a429466acface68..bbadae5873db4b49273b054c1921a401
}
public ChestBoat(Level world, double d0, double d1, double d2) {
@@ -170,7 +173,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@@ -172,7 +175,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@Override
public int getContainerSize() {
@@ -195,7 +195,7 @@ index 58af87b8faf4f8d6bdb111c49a429466acface68..bbadae5873db4b49273b054c1921a401
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index fe4c1659f0ca111db8a6d2d6b06d1783872705d6..80a5df11f57fb39a71461b774f0f5bcf94cd4c5c 100644
index a5dec9d6858fc19d6877a8ae93e51dcbccabd635..6263ef379b5078e04d1362b5ed1577d4abd5e72f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -328,6 +328,7 @@ public class PurpurConfig {
@@ -215,13 +215,13 @@ index fe4c1659f0ca111db8a6d2d6b06d1783872705d6..80a5df11f57fb39a71461b774f0f5bcf
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87fb01c170 100644
index d8de8710d9b8cf2ae5c434b2b0b27e76ffbbe4bf..da6018f80e695e390eb5f8f67542e3f8762ec3b1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1170,7 +1170,17 @@ public class PurpurWorldConfig {
@@ -1178,7 +1178,17 @@ public class PurpurWorldConfig {
public boolean allayRidable = false;
public boolean allayRidableInWater = true;
public boolean allayControllable = true;
public List<String> allayRespectNBT = new ArrayList<>();
+ // DivineMC start - Add missing purpur config options
+ public double allayMaxHealth = 20.0D;
+ public boolean allayTakeDamageFromWater = false;
@@ -236,7 +236,7 @@ index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87
allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
@@ -1289,7 +1299,15 @@ public class PurpurWorldConfig {
@@ -1295,7 +1305,15 @@ public class PurpurWorldConfig {
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
public int camelBreedingTicks = 6000;
@@ -252,7 +252,7 @@ index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1717,7 +1735,17 @@ public class PurpurWorldConfig {
@@ -1723,7 +1741,17 @@ public class PurpurWorldConfig {
public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F;
public int frogBreedingTicks = 6000;
@@ -270,7 +270,7 @@ index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87
frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
@@ -2668,7 +2696,15 @@ public class PurpurWorldConfig {
@@ -2676,7 +2704,15 @@ public class PurpurWorldConfig {
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
public int snifferBreedingTicks = 6000;
@@ -286,7 +286,7 @@ index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
@@ -2767,7 +2803,17 @@ public class PurpurWorldConfig {
@@ -2775,7 +2811,17 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true;
@@ -304,7 +304,7 @@ index 7dc82ffccc157a17335f1bc56ab81be3813294f6..41576be4fa6c3302274a4c8f48e84c87
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -2983,7 +3029,17 @@ public class PurpurWorldConfig {
@@ -2991,7 +3037,17 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;

2
patches/unapplied/server/0006-Fix-MC-93826.patch → patches/server/0006-Fix-MC-93826.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-93826
diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
index 8773b1072016a3bbf025959e9ab827704ec17fc6..90ae72a1ccf4acbac08bba7a3c453da01d2f57b3 100644
index 7f90a0d8f65c96844df06b7c4fa3da28a6f51dd1..1dcb6fd2e59f48e7e6ab3a03a5f66c8d538b4f22 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
@@ -42,6 +42,8 @@ public abstract class Animal extends AgeableMob {

12
patches/unapplied/server/0008-Don-t-save-Fireworks.patch → patches/server/0007-Don-t-save-Fireworks.patch
View File

@@ -5,21 +5,23 @@ Subject: [PATCH] Don't save Fireworks
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
index 5b3b59057b962438c6f4fc8a1507342865b3bc11..f09388fa1fb3a84da4678ea46761a55872a03cc8 100644
index 3df4005b6ddc075e5922c1e96e4ceb21d8b8ea43..aa9b734820b1e240e4ce7a323f6c328eaa563fdc 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
@@ -355,4 +355,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
public boolean isAttackable() {
@@ -345,6 +345,13 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
return false;
}
+
+ // DivineMC start - Don't save Fireworks
+ @Override
+ public boolean shouldBeSaved() {
+ return this.level().divinemcConfig.saveFireworks;
+ }
+ // DivineMC end
}
+
private static ItemStack getDefaultItem() {
return new ItemStack(Items.FIREWORK_ROCKET);
}
diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java
index 3e64e0d2d925f9fca1eb38cc07c20cae785ef39f..243b3d4379f4f6f273222a3611d8a463053d3e70 100644
--- a/src/main/java/space/bxteam/divinemc/configuration/DivineWorldConfig.java

0
patches/unapplied/server/0011-Fix-MC-110386.patch → patches/server/0008-Fix-MC-110386.patch
View File

4
patches/unapplied/server/0013-Fix-MC-31819.patch → patches/server/0009-Fix-MC-31819.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 43199815ffe3d666577390b96187aa898ceb910e..a7ea4d1bef425f43a6854e719660cda6c29cabfa 100644
index 845c4af5d5d38d54de4a1b20fe32bf5dd4776a29..21c4458cc93e1d11a235a0446b3ce305065dc72f 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1914,6 +1914,11 @@ public abstract class Player extends LivingEntity {
@@ -1932,6 +1932,11 @@ public abstract class Player extends LivingEntity {
}
public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

4
patches/unapplied/server/0015-Fix-MC-172801.patch → patches/server/0010-Fix-MC-172801.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 56811b7068450a56818dcc03d1777d082df88d52..b48736a9f60c92d904e31f1faaacb6caf47d4070 100644
index 53ff232129443ba3242cfc57fc57026bf76d96e8..66c353e3dcca3704094ec71c38219bf74e7d7fbb 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3094,7 +3094,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3134,7 +3134,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected float getFlyingSpeed() {

6
patches/unapplied/server/0016-Fix-MC-2025.patch → patches/server/0011-Fix-MC-2025.patch
View File

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
Fix taken from Reddit: https://redd.it/8pgd4q
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8f948df85246ecbbca2c3c2b99e24f847b7386c6..2702de4408df4c74fef1951add2e38d92abc144c 100644
index 3aae4fa4176c0bf170f4532ae187e3122c142a6a..288edb7bcf2159822d6bd14e9a6378a8bad0c689 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2522,6 +2522,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2582,6 +2582,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
}
// Purpur end
@@ -28,7 +28,7 @@ index 8f948df85246ecbbca2c3c2b99e24f847b7386c6..2702de4408df4c74fef1951add2e38d9
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2599,6 +2610,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2659,6 +2670,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.reapplyPosition();
}

4
patches/unapplied/server/0018-Fix-MC-65198.patch → patches/server/0012-Fix-MC-65198.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-65198
Original post on Mojira: https://bugs.mojang.com/browse/MC-65198
diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
index 3756de835ea87e3a4fb87cbf77365ffd87957ea9..e5f40f0a8702c98914384e9ffd204da888f39262 100644
index 7215af6cc91f48b040c23c54536d4aac8d293497..02168ed47fe37e3d8edfc0f19880eb5d9c334502 100644
--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
@@ -141,6 +141,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
@@ -27,7 +27,7 @@ index 3756de835ea87e3a4fb87cbf77365ffd87957ea9..e5f40f0a8702c98914384e9ffd204da8
}
diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
index accf752e7615f775483830f81bd0df30e40d3c7f..54f83aaa7aaca680965b7e53fd2d1660896af53e 100644
index f17ff5988d826c8fad68f6bf7bac1d06edae01ae..7c79527c4d38dfe8e1537091a73ee3ff3650dfd9 100644
--- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java
+++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java
@@ -45,7 +45,7 @@ public class ResultSlot extends Slot {

0
patches/unapplied/server/0020-Fix-MC-7569.patch → patches/server/0013-Fix-MC-7569.patch
View File

4
patches/unapplied/server/0021-Fix-MC-93018.patch → patches/server/0014-Fix-MC-93018.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-93018
Original post on Mojira: https://bugs.mojang.com/browse/MC-93018
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index a90055fe8819a32180754b6060a0f88e81d1a3b6..cf52c73dfc4d078959d618af5d0efca3801b1d99 100644
index e1f6202df983be2510436538904a45beedbdc9c2..c8ca03f0bdc1d04d3314b18cf8fe02e0e2740f3e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -655,14 +655,17 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -772,14 +772,17 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
public boolean canMate(Animal other) {
if (other == this) {
return false;

8
patches/unapplied/server/0009-Remove-Spigot-tick-limiter.patch → patches/server/0015-Remove-Spigot-tick-limiter.patch
View File

@@ -7,10 +7,10 @@ Original code by Titaniumtown, modified by NONPLAYT
You can find the original code on https://gitlab.com/Titaniumtown/JettPack
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 7683f6a99dfac07ae6ab0d9fd42598b4f57907e8..702729d610d090af934f7b95c9e0877d9441df42 100644
index 6a3c349cb36a0c89747cf4665e7bc272d6c59365..02899e5bdb23d8e032c721beaac3f280201394b2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -171,8 +171,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -175,8 +175,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public final DivineWorldConfig divinemcConfig; // DivineMC
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
@@ -19,14 +19,12 @@ index 7683f6a99dfac07ae6ab0d9fd42598b4f57907e8..702729d610d090af934f7b95c9e0877d
private int tileTickPosition;
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
@@ -343,9 +341,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -342,8 +340,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
});
// CraftBukkit end
this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
- this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded
- this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
- this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
+ this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded // DivineMC - Remove Spigot tick limiter
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
// Paper start - optimise collisions
this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);