Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-20 23:39:16 +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@07979c3 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-08-14 23:37:25 +03:00
parent 1e52f8b4a6
commit a134f62e93
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -36,7 +36,7 @@ All other files are licensed under MIT.
[![bStats](https://bstats.org/signatures/server-implementation/DivineMC.svg)](https://bstats.org/plugin/server-implementation/DivineMC) [![bStats](https://bstats.org/signatures/server-implementation/DivineMC.svg)](https://bstats.org/plugin/server-implementation/DivineMC)
## API ## API
### [Javadoc](https://repo.bx-team.space/javadoc/snapshots/space/bxteam/divinemc/divinemc-api/1.21-R0.1-SNAPSHOT) ### [Javadoc](https://repo.bx-team.space/javadoc/snapshots/space/bxteam/divinemc/divinemc-api/1.21.1-R0.1-SNAPSHOT)
### Dependency Information ### Dependency Information
@@ -51,7 +51,7 @@ All other files are licensed under MIT.
<dependency> <dependency>
<groupId>space.bxteam.divinemc</groupId> <groupId>space.bxteam.divinemc</groupId>
<artifactId>divinemc-api</artifactId> <artifactId>divinemc-api</artifactId>
<version>1.21-R0.1-SNAPSHOT</version> <version>1.21.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
``` ```
@@ -64,7 +64,7 @@ repositories {
``` ```
```groovy ```groovy
dependencies { dependencies {
compileOnly("space.bxteam.divinemc:divinemc-api:1.21-R0.1-SNAPSHOT") compileOnly("space.bxteam.divinemc:divinemc-api:1.21.1-R0.1-SNAPSHOT")
} }
``` ```

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21.1 mcVersion = 1.21.1
version = 1.21.1-R0.1-SNAPSHOT version = 1.21.1-R0.1-SNAPSHOT
purpurRef = 366af801553647682121f30ccabb9bfe74e9b11f purpurRef = 07979c301479f990a6f4b36f4fb20dc6c1cea45e
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

30
patches/server/0003-Optimize-default-values-for-configs.patch
View File

@@ -21,10 +21,10 @@ index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..70ae8cd69935d6bc446bb3e425c7982b
public boolean strictAdvancementDimensionCheck = false; public boolean strictAdvancementDimensionCheck = false;
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; 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 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb7686add9573 100644 index 4bcf27f98765abf693e535cfc1756c27a10cb316..58dd2f3ffed21eb752e757b7b7d5114f4968b445 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/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 { @@ -152,9 +152,9 @@ public class WorldConfiguration extends ConfigurationPart {
public ArmorStands armorStands; public ArmorStands armorStands;
@@ -37,7 +37,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
} }
public Markers markers; public Markers markers;
@@ -253,8 +253,8 @@ public class WorldConfiguration extends ConfigurationPart { @@ -254,8 +254,8 @@ public class WorldConfiguration extends ConfigurationPart {
public Behavior behavior; public Behavior behavior;
public class Behavior extends ConfigurationPart { public class Behavior extends ConfigurationPart {
@@ -48,7 +48,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
public int experienceMergeMaxValue = -1; public int experienceMergeMaxValue = -1;
public boolean shouldRemoveDragon = false; public boolean shouldRemoveDragon = false;
public boolean zombiesTargetTurtleEggs = true; public boolean zombiesTargetTurtleEggs = true;
@@ -278,7 +278,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -279,7 +279,7 @@ public class WorldConfiguration extends ConfigurationPart {
public int playerInsomniaStartTicks = 72000; public int playerInsomniaStartTicks = 72000;
public int phantomsSpawnAttemptMinSeconds = 60; public int phantomsSpawnAttemptMinSeconds = 60;
public int phantomsSpawnAttemptMaxSeconds = 119; public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -57,16 +57,16 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
@BelowZeroToEmpty @BelowZeroToEmpty
public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT; public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT;
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
@@ -289,7 +289,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -290,7 +290,7 @@ public class WorldConfiguration extends ConfigurationPart {
} }
public boolean disablePlayerCrits = false; public boolean disablePlayerCrits = false;
- public boolean nerfPigmenFromNetherPortals = false; - public boolean nerfPigmenFromNetherPortals = false;
+ public boolean nerfPigmenFromNetherPortals = true; // DivineMC - optimize default values for configs + public boolean nerfPigmenFromNetherPortals = true; // DivineMC - optimize default values for configs
@Comment("Prevents merging items that are not on the same y level, preventing potential visual artifacts.")
public boolean onlyMergeItemsHorizontally = false;
public PillagerPatrols pillagerPatrols; public PillagerPatrols pillagerPatrols;
@@ -386,7 +386,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class PillagerPatrols extends ConfigurationPart {
@@ -383,7 +383,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Environment extends ConfigurationPart { public class Environment extends ConfigurationPart {
public boolean disableThunder = false; public boolean disableThunder = false;
public boolean disableIceAndSnow = false; public boolean disableIceAndSnow = false;
@@ -75,7 +75,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
public boolean disableExplosionKnockback = false; public boolean disableExplosionKnockback = false;
public boolean generateFlatBedrock = false; public boolean generateFlatBedrock = false;
public FrostedIce frostedIce; public FrostedIce frostedIce;
@@ -429,7 +429,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -432,7 +432,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Maps extends ConfigurationPart { public class Maps extends ConfigurationPart {
public int itemFrameCursorLimit = 128; public int itemFrameCursorLimit = 128;
@@ -84,7 +84,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
} }
public Fixes fixes; public Fixes fixes;
@@ -455,7 +455,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -458,7 +458,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Hopper extends ConfigurationPart { public class Hopper extends ConfigurationPart {
public boolean cooldownWhenFull = true; public boolean cooldownWhenFull = true;
public boolean disableMoveEvent = false; public boolean disableMoveEvent = false;
@@ -93,7 +93,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
} }
public Collisions collisions; public Collisions collisions;
@@ -463,9 +463,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -466,9 +466,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Collisions extends ConfigurationPart { public class Collisions extends ConfigurationPart {
public boolean onlyPlayersCollide = false; public boolean onlyPlayersCollide = false;
public boolean allowVehicleCollisions = true; public boolean allowVehicleCollisions = true;
@@ -105,7 +105,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
public boolean allowPlayerCrammingDamage = false; public boolean allowPlayerCrammingDamage = false;
} }
@@ -473,18 +473,31 @@ public class WorldConfiguration extends ConfigurationPart { @@ -476,18 +476,31 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends ConfigurationPart { public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -147,7 +147,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
}); });
public boolean flushRegionsOnSave = false; public boolean flushRegionsOnSave = false;
} }
@@ -499,13 +512,15 @@ public class WorldConfiguration extends ConfigurationPart { @@ -502,13 +515,15 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates; public TickRates tickRates;
public class TickRates extends ConfigurationPart { public class TickRates extends ConfigurationPart {
@@ -168,7 +168,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
} }
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -514,7 +529,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -517,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart {
@SuppressWarnings("unused") // Is used in FeatureSeedsGeneration @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
@Setting(FeatureSeedsGeneration.GENERATE_KEY) @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -177,7 +177,7 @@ index 7509b17414f836e8b53fc62b02b386ba4e8c5ca9..3ace9f8cb1e04887b5d2fd7af76eb768
@Setting(FeatureSeedsGeneration.FEATURES_KEY) @Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>(); public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -535,9 +550,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -538,9 +553,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart { public class Misc extends ConfigurationPart {
public int lightQueueSize = 20; public int lightQueueSize = 20;

8
patches/server/0037-Block-Log4Shell-exploit.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 29d69101326017f68b10329f51dd6b93c1bf1d60..5365ce5da2b78be0001e3dba39feb969801603e0 100644 index 3c038a992083f96b6406e786c5bb1177c1fe4c51..cbaa7df3a292134e9e19f565a4f1a8f025d829da 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2353,6 +2353,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -2347,6 +2347,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
} }
private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index 29d69101326017f68b10329f51dd6b93c1bf1d60..5365ce5da2b78be0001e3dba39feb969
if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) { if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
@@ -2384,6 +2385,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -2378,6 +2379,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
} }
} }
@@ -33,7 +33,7 @@ index 29d69101326017f68b10329f51dd6b93c1bf1d60..5365ce5da2b78be0001e3dba39feb969
for (int i = 0; i < message.length(); ++i) { for (int i = 0; i < message.length(); ++i) {
if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) { if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 41863584c3a85068b807a5aeb93c3da70f133b47..f99dadddead3a820cc747ecbace8c1119a263061 100644 index 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..3ab958a84a8f13eeaa5f3d6003d1d389fccd5384 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

8
patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable moved wrongly threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5365ce5da2b78be0001e3dba39feb969801603e0..4621945946d1495b8f038c96891722a21067c0c5 100644 index cbaa7df3a292134e9e19f565a4f1a8f025d829da..fbd6471eebabd601ad972ea2bc245c5b0397a2b2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -585,7 +585,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -585,7 +585,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -26,7 +26,7 @@ index 5365ce5da2b78be0001e3dba39feb969801603e0..4621945946d1495b8f038c96891722a2
flag2 = true; flag2 = true;
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
} }
@@ -1438,7 +1438,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -1432,7 +1432,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY, io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
toX, toY, toZ, toYaw, toPitch, true); toX, toY, toZ, toYaw, toPitch, true);
if (!event.isAllowed()) { if (!event.isAllowed()) {
@@ -35,7 +35,7 @@ index 5365ce5da2b78be0001e3dba39feb969801603e0..4621945946d1495b8f038c96891722a2
ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8}); ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot()); this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
return; return;
@@ -1507,7 +1507,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -1501,7 +1501,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
d10 = d6 * d6 + d7 * d7 + d8 * d8; d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean movedWrongly = false; // Paper - Add fail move event; rename boolean movedWrongly = false; // Paper - Add fail move event; rename
@@ -45,7 +45,7 @@ index 5365ce5da2b78be0001e3dba39feb969801603e0..4621945946d1495b8f038c96891722a2
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY, io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY,
toX, toY, toZ, toYaw, toPitch, true); toX, toY, toZ, toYaw, toPitch, true);
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 2580a13c80f6a8f6bb35b4c82014628732660019..9d3d52e4798451ec4f30f735bcdef0ef4dde0cbf 100644 index 883e3a0c281a4872c74df96e2ce51993f5c4ccee..acf4a5287ba8d1ec8b4157426aa5794211654b7b 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,9 +155,11 @@ public class DivineConfig { @@ -155,9 +155,11 @@ public class DivineConfig {