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:
PurpurMC/Purpur@603c7557 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2025-05-10 13:20:10 +03:00
parent b132fcf5d7
commit d175c168ef
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch
View File

@@ -1481,7 +1481,7 @@ index 56eabc55203756461fc679837b55b30a5c503268..e139b875314686f252127db11536abd7
for (Entity entity : passengerEntity.getPassengers()) {
this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 45c7ffb6822e04ef08705396e87c51a8a074bfc2..d5dfd49f3e5039661fe39cc8bf8853c81511c0d0 100644
index 9a7773d0496f5ba537557e378803255981db14cd..fa9bbf447b32e27a8714950215b36233712a025d 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -103,8 +103,6 @@ import net.minecraft.util.HashOps;
@@ -1493,7 +1493,7 @@ index 45c7ffb6822e04ef08705396e87c51a8a074bfc2..d5dfd49f3e5039661fe39cc8bf8853c8
import net.minecraft.world.Container;
import net.minecraft.world.Difficulty;
import net.minecraft.world.InteractionHand;
@@ -1415,14 +1413,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1408,14 +1406,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.unsetRemoved();
*/
// CraftBukkit end
@@ -1508,7 +1508,7 @@ index 45c7ffb6822e04ef08705396e87c51a8a074bfc2..d5dfd49f3e5039661fe39cc8bf8853c8
// CraftBukkit start
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
LevelData worlddata = level.getLevelData();
@@ -1440,7 +1434,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1433,7 +1427,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
level.addDuringTeleport(this);

12
divinemc-server/minecraft-patches/features/0043-Parallel-world-ticking.patch
View File

@@ -316,10 +316,10 @@ index 9db7c44f4d5985460510e11aa7060109ed51481a..b609361d4ff1d42d3ac40411013de767
// Paper start - extra debug info
if (entity.valid) {
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b3191013ffc727e 100644
index fa9bbf447b32e27a8714950215b36233712a025d..56c10c0537f6ca48cb4bc0e426cbba3bddc7a98a 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -459,6 +459,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -452,6 +452,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
return this.viewDistanceHolder;
}
// Paper end - rewrite chunk system
@@ -327,7 +327,7 @@ index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b319101
public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
super(level, level.getSharedSpawnPos(), level.getSharedSpawnAngle(), gameProfile);
@@ -752,6 +753,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -745,6 +746,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@Override
public void tick() {
@@ -335,7 +335,7 @@ index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b319101
// CraftBukkit start
if (this.joining) {
this.joining = false;
@@ -1402,6 +1404,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1395,6 +1397,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
return this;
} else {
// CraftBukkit start
@@ -343,7 +343,7 @@ index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b319101
/*
this.isChangingDimension = true;
LevelData levelData = level.getLevelData();
@@ -1743,6 +1746,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1736,6 +1739,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
return OptionalInt.empty();
} else {
// CraftBukkit start
@@ -356,7 +356,7 @@ index d5dfd49f3e5039661fe39cc8bf8853c81511c0d0..9e58eb6d4c554c707456e29b9b319101
this.containerMenu = abstractContainerMenu; // Moved up
if (!this.isImmobile())
this.connection
@@ -1807,6 +1816,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1800,6 +1809,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
@Override
public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {

2
divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2195,6 +_,7 @@
@@ -2188,6 +_,7 @@
this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId()));
if (gameMode == GameType.SPECTATOR) {
this.removeEntitiesOnShoulder();

6
divinemc-server/paper-patches/features/0005-Chunk-System-Optimizations.patch
View File

@@ -664,10 +664,10 @@ index 559c959aff3c9deef867b9e425fba3e2e669cac6..a5b0585b56d71d21c9da3b129d213def
private MoonriseConstants() {}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 6e9bfd986674c26240700c788987028be4ec32e7..4fd8c2f6fdefe518b5cea0ae81901c44be0ff021 100644
index c2b53adb5f0fd8207cf13cb6f7249385b1c30f34..83419bbcbf79d8eed1302d66356a62fa61a33473 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -229,7 +229,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -227,7 +227,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@PostProcess
private void postProcess() {
@@ -676,7 +676,7 @@ index 6e9bfd986674c26240700c788987028be4ec32e7..4fd8c2f6fdefe518b5cea0ae81901c44
String newChunkSystemGenParallelism = this.genParallelism;
if (newChunkSystemGenParallelism.equalsIgnoreCase("default")) {
newChunkSystemGenParallelism = "true";
@@ -245,7 +245,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -243,7 +243,6 @@ public class GlobalConfiguration extends ConfigurationPart {
} else {
throw new IllegalStateException("Invalid option for gen-parallelism: must be one of [on, off, enabled, disabled, true, false, default]");
}

4
divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize canSee checks
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 09fc84319df0adb741dc29092ae33768878c8676..e266222c30155bb792e62841acf009178811473c 100644
index 07c45bce5f3ceea897b9453a2c1568cdb2479560..381fc6b0a3dcafb8de148522ef2cad6cfcbe0ddd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -212,7 +212,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -17,7 +17,7 @@ index 09fc84319df0adb741dc29092ae33768878c8676..e266222c30155bb792e62841acf00917
private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
private int hash = 0;
@@ -2268,9 +2268,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2267,9 +2267,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(org.bukkit.entity.Entity entity) {

4
divinemc-server/paper-patches/features/0015-Optimize-default-values-for-configs.patch
View File

@@ -5,10 +5,10 @@ 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 4fd8c2f6fdefe518b5cea0ae81901c44be0ff021..ae70fb008ff35b83c82dabec9a62c20ab94ea722 100644
index 83419bbcbf79d8eed1302d66356a62fa61a33473..caa4cf0af0696b90d61f32f5445a6e6c6b5bae5d 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -349,8 +349,8 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -347,8 +347,8 @@ public class GlobalConfiguration extends ConfigurationPart {
@Constraints.Min(4)
public int regionFileCacheSize = 256;
@Comment("See https://luckformula.emc.gs")

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
version=1.21.5-R0.1-SNAPSHOT
mcVersion=1.21.5
purpurRef=9d0aa8ebdea1f49d3828fe0e5c85effa8c658d1a
purpurRef=603c7557ba19f065be0a837d73bce26a8cc61999
experimental=true
org.gradle.configuration-cache=true