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@39617d5 entities with passengers can go through portals now, closes #1540
This commit is contained in:
NONPLAYT
2024-06-28 01:24:26 +03:00
parent ebf82913c5
commit 281919eef6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.21 mcVersion = 1.21
version = 1.21-R0.1-SNAPSHOT version = 1.21-R0.1-SNAPSHOT
purpurRef = ad910f82105c79c3fe7b4b9c18886601d4f96fb0 purpurRef = 39617d5c9df0ed67f4b9c7cbcbc4f23a0dbae37e
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

@@ -210,10 +210,10 @@ index 73352e71d3743fc6b263d6fa5b23571785e2fc4c..87e54aa5e14a0e92df88ea775966c026
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); 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 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752faf020ce2 100644 index 2cb73db565bc55a0c49310cf76ee3ed7a6821c6a..5975d04d34a3b3ab6eb15a9ccab4cb9da40ad62a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1167,12 +1167,20 @@ public class PurpurWorldConfig { @@ -1171,12 +1171,20 @@ public class PurpurWorldConfig {
public boolean allayControllable = true; public boolean allayControllable = true;
public double allayMaxHealth = 20.0D; public double allayMaxHealth = 20.0D;
public double allayScale = 1.0D; public double allayScale = 1.0D;
@@ -234,7 +234,7 @@ index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752f
} }
public boolean armadilloRidable = false; public boolean armadilloRidable = false;
@@ -1322,7 +1330,15 @@ public class PurpurWorldConfig { @@ -1326,7 +1334,15 @@ public class PurpurWorldConfig {
public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D; public double camelMovementSpeedMax = 0.09D;
public int camelBreedingTicks = 6000; public int camelBreedingTicks = 6000;
@@ -250,7 +250,7 @@ index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752f
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater); camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax); camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1776,7 +1792,17 @@ public class PurpurWorldConfig { @@ -1780,7 +1796,17 @@ public class PurpurWorldConfig {
public boolean frogControllable = true; public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F; public float frogRidableJumpHeight = 0.65F;
public int frogBreedingTicks = 6000; public int frogBreedingTicks = 6000;
@@ -268,7 +268,7 @@ index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752f
frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
frogControllable = getBoolean("mobs.frog.controllable", frogControllable); frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
@@ -2788,7 +2814,15 @@ public class PurpurWorldConfig { @@ -2792,7 +2818,15 @@ public class PurpurWorldConfig {
public double snifferMaxHealth = 14.0D; public double snifferMaxHealth = 14.0D;
public double snifferScale = 1.0D; public double snifferScale = 1.0D;
public int snifferBreedingTicks = 6000; public int snifferBreedingTicks = 6000;
@@ -284,7 +284,7 @@ index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752f
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
@@ -2896,7 +2930,17 @@ public class PurpurWorldConfig { @@ -2900,7 +2934,17 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false; public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true; public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true; public boolean tadpoleControllable = true;
@@ -302,7 +302,7 @@ index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752f
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -3124,7 +3168,17 @@ public class PurpurWorldConfig { @@ -3128,7 +3172,17 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false; public boolean wardenRidable = false;
public boolean wardenRidableInWater = true; public boolean wardenRidableInWater = true;
public boolean wardenControllable = true; public boolean wardenControllable = true;