Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +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@c0f5e78 add default silverfish movement speed & attack damage attributes
PurpurMC/Purpur@b82f693 configurable mob size attribute (#1538)
PurpurMC/Purpur@e05f91b [ci skip] move import to config patch
PurpurMC/Purpur@2ba7bee Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-06-21 14:56:10 +03:00
parent e61de52a5c
commit 428e0cb6d3
7 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
patches/server/0004-Add-missing-purpur-config-options.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing purpur config options
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 37bdc1bd1ce7f402418b1e8c57c6f58540571ec2..a44cd4f5ba28b8933342923fa78ea2c0ccd6bba9 100644
index 0f9196cc26e5c670a7f3454326b762f0303f633c..fbdc854625d0b78e6c5cf113a2fc5591b15d2da0 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -154,6 +154,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -160,6 +160,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
}
// Purpur end
@@ -112,10 +112,10 @@ index 0656e03bdd71f5d81853e817e136c8f11667c76e..51f12adc5f798ffb9de4ab87dc10728e
protected PathNavigation createNavigation(Level world) {
return new WaterBoundPathNavigation(this, world);
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index 072f6ea6ed0bb543b1d71628a1e1e43f73719a09..7725ff08b9656a5889d6763c63b2b74451ed9793 100644
index b6f5281705ce4c7a755e3818cf6c4a2235a024f9..13d73b88e33d279ae96bf160fa25d47c88dd6a55 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -121,6 +121,18 @@ public class Sniffer extends Animal {
@@ -122,6 +122,18 @@ public class Sniffer extends Animal {
}
// Purpur end
@@ -215,28 +215,31 @@ index 73352e71d3743fc6b263d6fa5b23571785e2fc4c..87e54aa5e14a0e92df88ea775966c026
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 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e0456067c26f 100644
index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752faf020ce2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1164,7 +1164,17 @@ public class PurpurWorldConfig {
public boolean allayRidable = false;
public boolean allayRidableInWater = true;
@@ -1167,12 +1167,20 @@ public class PurpurWorldConfig {
public boolean allayControllable = true;
public double allayMaxHealth = 20.0D;
public double allayScale = 1.0D;
+ // DivineMC start - Add missing purpur config options
+ public double allayMaxHealth = 20.0D;
+ public boolean allayTakeDamageFromWater = false;
+ public boolean allayAlwaysDropExp = false;
+ // DivineMC end
private void allaySettings() {
+ // DivineMC start - Add missing purpur config options
+ allayMaxHealth = getDouble("mobs.allay.max-health", allayMaxHealth);
+ allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater);
+ allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp);
+ // DivineMC end
allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
@@ -1305,7 +1315,15 @@ public class PurpurWorldConfig {
allayMaxHealth = getDouble("mobs.allay.attributes.max_health", allayMaxHealth);
allayScale = Mth.clamp(getDouble("mobs.allay.attributes.scale", allayScale), 0.0625D, 16.0D);
+ // DivineMC start - Add missing purpur config options
+ allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater);
+ allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp);
+ // DivineMC end
}
public boolean armadilloRidable = false;
@@ -1322,7 +1330,15 @@ public class PurpurWorldConfig {
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
public int camelBreedingTicks = 6000;
@@ -252,7 +255,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1733,7 +1751,17 @@ public class PurpurWorldConfig {
@@ -1776,7 +1792,17 @@ public class PurpurWorldConfig {
public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F;
public int frogBreedingTicks = 6000;
@@ -270,9 +273,9 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045
frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
@@ -2686,7 +2714,15 @@ public class PurpurWorldConfig {
public boolean snifferControllable = true;
@@ -2788,7 +2814,15 @@ public class PurpurWorldConfig {
public double snifferMaxHealth = 14.0D;
public double snifferScale = 1.0D;
public int snifferBreedingTicks = 6000;
+ // DivineMC start - Add missing purpur config options
+ public boolean snifferTakeDamageFromWater = false;
@@ -286,7 +289,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
@@ -2785,7 +2821,17 @@ public class PurpurWorldConfig {
@@ -2896,7 +2930,17 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true;
@@ -304,7 +307,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -3001,7 +3047,17 @@ public class PurpurWorldConfig {
@@ -3124,7 +3168,17 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;