Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-22 08:19:19 +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@0f0f600 Updated Upstream (Paper)
PurpurMC/Purpur@d8e95e0 Updated Upstream (Paper)
PurpurMC/Purpur@e1603ae Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-05-11 03:56:12 +03:00
parent d622b5a146
commit e1f80bb9ac
12 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = space.bxteam.divinemc group = space.bxteam.divinemc
version = 1.20.6-R0.1-SNAPSHOT version = 1.20.6-R0.1-SNAPSHOT
purpurRef = 8aa793450315a361548f5e1dce4edf18e606bf51 purpurRef = e1603ae33f4d4fa00d7a166335160d8a5b97496d
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

2
patches/server/0025-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch → patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch
View File

@@ -7,7 +7,7 @@ Original code by RelativityMC, licensed under MIT
You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 4e6fccec4f5ca14562bf5bae495ac36c14982d85..be8870d01262b37d130d518a500db7117f568950 100644 index 345f143b0eeb77acb96e4bc716f3b23782ac782f..97545fd84b9b1716e9847cac9e233742ea7f9252 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -110,6 +110,8 @@ import org.slf4j.Logger; @@ -110,6 +110,8 @@ import org.slf4j.Logger;

0
patches/server/0026-lithium-ai.raid.patch → patches/server/0025-lithium-ai.raid.patch
View File

0
patches/server/0027-lithium-collections.gamerules.patch → patches/server/0026-lithium-collections.gamerules.patch
View File

0
patches/server/0028-lithium-collections.entity_by_type.patch → patches/server/0027-lithium-collections.entity_by_type.patch
View File

0
patches/server/0029-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch → patches/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
View File

0
patches/server/0030-lithium-precompute-shape-arrays.patch → patches/server/0029-lithium-precompute-shape-arrays.patch
View File

7
patches/server/0031-Carpet-Fixes-Sheep-Optimization.patch → patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch
View File

@@ -62,17 +62,16 @@ index 6b1244d3957e7f62c96ffd34692b8916337839fd..994d81bb16040439ecbdf427dfde70d2
private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) { private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
TransientCraftingContainer transientcraftingcontainer = new TransientCraftingContainer(new AbstractContainerMenu((MenuType) null, -1) { TransientCraftingContainer transientcraftingcontainer = new TransientCraftingContainer(new AbstractContainerMenu((MenuType) null, -1) {
diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java diff --git a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
index 67ff4450b58c1df2f595a136c53d60bbefa2e8d5..13ea61e380ea8d0772107b06008bf86e274e5f91 100644 index 73b6c3590dad95cddd9cc1a1cff36492175da232..bf550fa360f69b714ac346333c78d7f8de2a71b9 100644
--- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java --- a/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
+++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java +++ b/src/main/java/space/bxteam/divinemc/configuration/DivineConfig.java
@@ -155,8 +155,10 @@ public class DivineConfig { @@ -154,7 +154,9 @@ public class DivineConfig {
}
public static boolean biomeManagerOptimization = true; public static boolean biomeManagerOptimization = true;
public static boolean recipeManagerOptimization = true;
+ public static boolean sheepOptimization = true; + public static boolean sheepOptimization = true;
private static void optimizations() { private static void optimizations() {
biomeManagerOptimization = getBoolean("settings.optimizations.biome-manager-optimization", biomeManagerOptimization); biomeManagerOptimization = getBoolean("settings.optimizations.biome-manager-optimization", biomeManagerOptimization);
recipeManagerOptimization = getBoolean("settings.optimizations.recipe-manager-optimization", recipeManagerOptimization);
+ sheepOptimization = getBoolean("settings.optimizations.sheep-optimization", sheepOptimization); + sheepOptimization = getBoolean("settings.optimizations.sheep-optimization", sheepOptimization);
} }
} }

0
patches/server/0032-Snowball-and-Egg-knockback.patch → patches/server/0031-Snowball-and-Egg-knockback.patch
View File

6
patches/server/0033-Suppress-errors-from-dirty-attributes.patch → patches/server/0032-Suppress-errors-from-dirty-attributes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c9525b636 100644 index dd6278fe99e2ee4daa95249c71ea935dd08b0025..7e2bd649b3525ccd5db052f83c9b8818d7f13d78 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -386,7 +386,10 @@ public class ServerEntity { @@ -394,7 +394,10 @@ public class ServerEntity {
} }
if (this.entity instanceof LivingEntity) { if (this.entity instanceof LivingEntity) {
@@ -20,7 +20,7 @@ index 39e7dcf3c92c9203c190782be401c00c010b8aeb..78ce9687a163255098eb8408dacefa1c
if (!set.isEmpty()) { if (!set.isEmpty()) {
// CraftBukkit start - Send scaled max health // CraftBukkit start - Send scaled max health
@@ -397,7 +400,7 @@ public class ServerEntity { @@ -405,7 +408,7 @@ public class ServerEntity {
this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set)); this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
} }

0
patches/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch → patches/unapplied/server/0023-Carpet-Fixes-RecipeManager-Optimize.patch
View File