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

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
This commit is contained in:
NONPLAYT
2024-05-29 02:07:13 +03:00
parent a378bd1c40
commit 618ce1fe3e
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.20.6
version = 1.20.6-R0.1-SNAPSHOT
purpurRef = 2842b97ddf051139e4f76b54ec1731e73e0140ba
purpurRef = ec1b4fa7ad3101638fc9a4542fc24153e03ce61f
org.gradle.caching = true
org.gradle.parallel = true

10
patches/server/0002-Divine-Configuration.patch
View File

@@ -34,7 +34,7 @@ index 957da64ddd0a56f457122a3f590b45e348f22382..f7db49d673853f31eacc76f5286b6a52
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 487bb3e75afc5871a79506a54f0f4af806460b14..a128e56bb835e2c8f4551a235f4832fd00611273 100644
index 4beada452d014ec7dc7c167466ec2af3c5bfcd33..63629a36572cd83977886c016084fd5ebefab65c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -81,6 +81,7 @@ import net.minecraft.world.level.storage.WritableLevelData;
@@ -45,7 +45,7 @@ index 487bb3e75afc5871a79506a54f0f4af806460b14..a128e56bb835e2c8f4551a235f4832fd
// CraftBukkit start
import java.util.HashMap;
@@ -171,6 +172,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -172,6 +173,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
@@ -53,7 +53,7 @@ index 487bb3e75afc5871a79506a54f0f4af806460b14..a128e56bb835e2c8f4551a235f4832fd
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -252,6 +254,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -253,6 +255,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
@@ -62,7 +62,7 @@ index 487bb3e75afc5871a79506a54f0f4af806460b14..a128e56bb835e2c8f4551a235f4832fd
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 6e78500a6265b0192095379704b1d661ef56ba32..ab9065c2d21f713b366e5cfd1534538fd2617782 100644
index f6b6d0d753e81d58cd21ba41d1e2f3e63267b743..b2f45d888604cdf4b98e86a8040962af27e7feda 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -263,6 +263,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -98,7 +98,7 @@ index 6e78500a6265b0192095379704b1d661ef56ba32..ab9065c2d21f713b366e5cfd1534538f
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3107,6 +3112,13 @@ public final class CraftServer implements Server {
@@ -3108,6 +3113,13 @@ public final class CraftServer implements Server {
}
// Purpur end

8
patches/server/0005-Add-missing-purpur-config-options.patch
View File

@@ -163,7 +163,7 @@ index 0bb577ec9ba0d23a741ccf067ac35f6be68312ca..68b533cdaa53af2d76e9b8ab050dc335
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 b04f7ce0805453f6c737fa9dc11c4129ca64e934..f36e20da4172e2128267cb37123dcf4105144fde 100644
index e0aec3b3e04d603dc208029554f981c6b9e6b43e..5954b62ad5b2f09dd0bbf6aad35488711f0fa780 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
@@ -34,6 +34,9 @@ import org.bukkit.entity.HumanEntity;
@@ -185,7 +185,7 @@ index b04f7ce0805453f6c737fa9dc11c4129ca64e934..f36e20da4172e2128267cb37123dcf41
}
public ChestBoat(Level world, double d0, double d1, double d2) {
@@ -172,7 +175,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@@ -170,7 +173,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@Override
public int getContainerSize() {
@@ -195,7 +195,7 @@ index b04f7ce0805453f6c737fa9dc11c4129ca64e934..f36e20da4172e2128267cb37123dcf41
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index a5dec9d6858fc19d6877a8ae93e51dcbccabd635..6263ef379b5078e04d1362b5ed1577d4abd5e72f 100644
index 3d37b1413187004df679ee7744d8be2aaaeec670..6a200c5c8c847569f0ef2d13efd9ac91ac04a350 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,7 +215,7 @@ index a5dec9d6858fc19d6877a8ae93e51dcbccabd635..6263ef379b5078e04d1362b5ed1577d4
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 d8de8710d9b8cf2ae5c434b2b0b27e76ffbbe4bf..da6018f80e695e390eb5f8f67542e3f8762ec3b1 100644
index 6717941d18dbd6871b4613106b9787063e11722f..3fddce6242c5be160259b93f8527a8022a6adac6 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1178,7 +1178,17 @@ public class PurpurWorldConfig {

6
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 3aae4fa4176c0bf170f4532ae187e3122c142a6a..288edb7bcf2159822d6bd14e9a6378a8bad0c689 100644
index 0c02fcbf76506bf2fc1ca2a16f361947ff6365b7..d220ed3592be8f8103bb02bbd761abf9bd8ad958 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2582,6 +2582,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2581,6 +2581,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
}
// Purpur end
@@ -28,7 +28,7 @@ index 3aae4fa4176c0bf170f4532ae187e3122c142a6a..288edb7bcf2159822d6bd14e9a6378a8
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2659,6 +2670,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2658,6 +2669,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
this.reapplyPosition();
}

6
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 a128e56bb835e2c8f4551a235f4832fd00611273..3cef82714ce25d84d4f28da4d671b1fbcf5107a6 100644
index 63629a36572cd83977886c016084fd5ebefab65c..0d2cc738559e8b241539b49a35195291e78a54f2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -175,8 +175,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -176,8 +176,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,7 +19,7 @@ index a128e56bb835e2c8f4551a235f4832fd00611273..3cef82714ce25d84d4f28da4d671b1fb
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
@@ -333,8 +331,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -334,8 +332,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

8
patches/server/0021-Optimize-CraftServer.getWorld-UUID.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize CraftServer.getWorld(UUID)
Original code by MultiPaper - https://github.com/MultiPaper/MultiPaper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ab9065c2d21f713b366e5cfd1534538fd2617782..318cc15ec0a1a70d32e2637b08c48677d38d14a3 100644
index b2f45d888604cdf4b98e86a8040962af27e7feda..d14f612f2e73374cba8d2a9724d899a62e7cf5c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -264,6 +264,7 @@ import javax.annotation.Nullable; // Paper
@@ -25,7 +25,7 @@ index ab9065c2d21f713b366e5cfd1534538fd2617782..318cc15ec0a1a70d32e2637b08c48677
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
@@ -1464,6 +1466,7 @@ public final class CraftServer implements Server {
@@ -1465,6 +1467,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -33,7 +33,7 @@ index ab9065c2d21f713b366e5cfd1534538fd2617782..318cc15ec0a1a70d32e2637b08c48677
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1482,6 +1485,7 @@ public final class CraftServer implements Server {
@@ -1483,6 +1486,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -41,7 +41,7 @@ index ab9065c2d21f713b366e5cfd1534538fd2617782..318cc15ec0a1a70d32e2637b08c48677
for (World world : this.worlds.values()) {
if (world.getUID().equals(uid)) {
return world;
@@ -1505,6 +1509,7 @@ public final class CraftServer implements Server {
@@ -1506,6 +1510,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}

8
patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch
View File

@@ -7,10 +7,10 @@ Original code by RelativityMC, licensed under MIT
You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1b8c11fe15f2f672214c75a4f8095ae179b67330..4e762c6ee1c4214b24aabe34a5757785d3e69b12 100644
index d220ed3592be8f8103bb02bbd761abf9bd8ad958..e71b24837f71839020a508971b3da161ace8fe7e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -320,6 +320,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -319,6 +319,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public float yRotO;
public float xRotO;
private AABB bb;
@@ -18,7 +18,7 @@ index 1b8c11fe15f2f672214c75a4f8095ae179b67330..4e762c6ee1c4214b24aabe34a5757785
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1153,6 +1154,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1152,6 +1153,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -31,7 +31,7 @@ index 1b8c11fe15f2f672214c75a4f8095ae179b67330..4e762c6ee1c4214b24aabe34a5757785
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4223,6 +4230,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4222,6 +4229,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {

10
patches/server/0035-Delete-Timings.patch
View File

@@ -1115,7 +1115,7 @@ index 8120f39a9689dae1233b243b74825e9ff110eac3..4203dae9628b0576cc0b9a9160dca985
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 18f03478a4f2c5b71d243aada4173abf9f33cc20..0f60b2fb44ecaf037c8235ed0d3da017e65310e3 100644
index f1e7b810603f2753a11e2ee89af9e030909d0386..d6ac041fad07bb1aebcf759ca304d119562e76ab 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -150,8 +150,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1168,10 +1168,10 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
this.scanRate = senseInterval;
this.timeToTick = (long)RANDOM.nextInt(senseInterval);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 3cef82714ce25d84d4f28da4d671b1fbcf5107a6..de44d842af2113af8dcd3791171c3a9d5ef88cde 100644
index 0d2cc738559e8b241539b49a35195291e78a54f2..d58e039f11670a0c1e6e999c1738020e752f434a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -173,7 +173,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -174,7 +174,6 @@ 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
public final DivineWorldConfig divinemcConfig; // DivineMC
@@ -1179,7 +1179,7 @@ index 3cef82714ce25d84d4f28da4d671b1fbcf5107a6..de44d842af2113af8dcd3791171c3a9d
public static BlockPos lastPhysicsProblem; // Spigot
private int tileTickPosition;
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
@@ -330,7 +329,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -331,7 +330,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
});
// CraftBukkit end
@@ -1187,7 +1187,7 @@ index 3cef82714ce25d84d4f28da4d671b1fbcf5107a6..de44d842af2113af8dcd3791171c3a9d
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);
@@ -1333,9 +1331,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1334,9 +1332,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075

6
patches/server/0042-Implement-Secure-Seed.patch
View File

@@ -572,7 +572,7 @@ index 82b4bd669c57b18fb0b443bcd94495023cd5a528..4cf13d10f24be20b2f9c8b0338b6af3d
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 318cc15ec0a1a70d32e2637b08c48677d38d14a3..8d22256ad0d7a5f00af600179ef91d9bef704d34 100644
index d14f612f2e73374cba8d2a9724d899a62e7cf5c8..2c5af5c226c386f8c2c31441f70e415d583a5829 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,6 +265,8 @@ import javax.annotation.Nonnull; // Paper
@@ -584,7 +584,7 @@ index 318cc15ec0a1a70d32e2637b08c48677d38d14a3..8d22256ad0d7a5f00af600179ef91d9b
public final class CraftServer implements Server {
private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
@@ -1356,7 +1358,7 @@ public final class CraftServer implements Server {
@@ -1357,7 +1359,7 @@ public final class CraftServer implements Server {
iregistrycustom_dimension = leveldataanddimensions.dimensions().dimensionsRegistryAccess();
} else {
LevelSettings worldsettings;
@@ -594,7 +594,7 @@ index 318cc15ec0a1a70d32e2637b08c48677d38d14a3..8d22256ad0d7a5f00af600179ef91d9b
DedicatedServerProperties.WorldDimensionData properties = new DedicatedServerProperties.WorldDimensionData(GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.type().name().toLowerCase(Locale.ROOT));
diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
index 1934e6c1282c33f4f8e183a97fc67f2016593eb3..289361efbb049d9672974ac4f97b2b2b45e05ace 100644
index f0be52e3a72a7eaa5b7d840fa00b5be1edacf156..e2eac66da19b1e9bc5f776d85b487d769121a9b3 100644
--- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
+++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
@@ -194,4 +194,9 @@ public class DivineConfig {