mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
0b95a8072a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5436d44 Deprecate several Keyed#getKey methods (#10357) PaperMC/Paper@a7f1dc6 Change online mode default for Velocity configuration (#10413) PaperMC/Paper@37db2d7 [ci skip] Update book page/char limit for book meta doc (#10415) PaperMC/Paper@526795b Update patches to handle vineflower decompiler (#10406) PaperMC/Paper@8fe90de [ci skip] Referenced InventoryDragEvent in documentation of InventoryClickEvent (#10395) PaperMC/Paper@46d462b Fix StackOverflowException thrown on shutdown (Fixes #10404) (#10408) PaperMC/Paper@f061e76 Fix hit criteria advancement triggered before changing state (#10409) PaperMC/Paper@3263470 Add color transition and clone functions to ParticleBuilder (#10342) PaperMC/Paper@4445d23 Deprecate ItemStack#setType & add ItemStack#withType (#10290)
40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Meln Cat <melncatuwu@gmail.com>
|
|
Date: Mon, 9 Oct 2023 12:21:49 -0700
|
|
Subject: [PATCH] Add option to disable the copper oxidation proximity penalty
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
|
|
index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2a36f62a7 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
|
|
@@ -67,7 +67,7 @@ public interface ChangeOverTimeBlock<T extends Enum<T>> {
|
|
}
|
|
|
|
float f = (float) (k + 1) / (float) (k + j + 1);
|
|
- float f1 = f * f * this.getChanceModifier();
|
|
+ float f1 = world.purpurConfig.disableOxidationProximityPenalty ? this.getChanceModifier() : f * f * this.getChanceModifier(); // Purpur
|
|
|
|
return random.nextFloat() < f1 ? this.getNext(state) : Optional.empty();
|
|
}
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
index 28ecc0e7d61a1c0a62bc0ec096cd601a45fa02db..002c9bba93dede25111c653ec1df38316f19421f 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -145,6 +145,7 @@ public class PurpurWorldConfig {
|
|
public boolean rainStopsAfterSleep = true;
|
|
public boolean thunderStopsAfterSleep = true;
|
|
public int mobLastHurtByPlayerTime = 100;
|
|
+ public boolean disableOxidationProximityPenalty = false;
|
|
private void miscGameplayMechanicsSettings() {
|
|
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
|
|
mendingMultiplier = getDouble("gameplay-mechanics.mending-multiplier", mendingMultiplier);
|
|
@@ -173,6 +174,7 @@ public class PurpurWorldConfig {
|
|
rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
|
|
thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
|
|
mobLastHurtByPlayerTime = getInt("gameplay-mechanics.mob-last-hurt-by-player-time", mobLastHurtByPlayerTime);
|
|
+ disableOxidationProximityPenalty = getBoolean("gameplay-mechanics.disable-oxidation-proximity-penalty", disableOxidationProximityPenalty);
|
|
}
|
|
|
|
public int daytimeTicks = 12000;
|