9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00

Updated Upstream (Gale/Purpur/Leaves/Dependencies)

This commit is contained in:
Dreeam
2024-02-03 04:22:26 -05:00
parent 6e6370d64e
commit 25091d3938
43 changed files with 1221 additions and 947 deletions

View File

@@ -37,7 +37,7 @@ index eb60d2d99155aae4a761051175fbbddf9ed5dad9..5444213b336bc08eb371673890ded04c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 11181c0429b720381e7752f8a0d5e89615bcce4b..637beec8d5a1d39748db9e87bfb9a999f2c728ec 100644
index 8a3e815bf1c35d39d3c07e483c5b8ef70ee45654..7b87ea3578f3bb8b7e93054171a0f66c0e0d1262 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -116,7 +116,7 @@ index 1fbd034002fd5761011976510b9f9263ca0f5cac..a9d75fe602d0f946519582d2eaf2eb55
@Override
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 b8a055f938ade211c07ca5a74bade19707568eb1..7e8de65d7e5f9251d8ea4fb9bd3a4044457e0bda 100644
index 9962e83e9478db6de3869d53eaa4c4dc9dc847b4..4e7867e7239eb573b287a70eee8191bdf434f686 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
@@ -106,6 +106,18 @@ public class Sniffer extends Animal {
@@ -139,7 +139,7 @@ index b8a055f938ade211c07ca5a74bade19707568eb1..7e8de65d7e5f9251d8ea4fb9bd3a4044
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
index c23d192baf78890093b0e88d03735eef4569e75f..25ee9670c37c4342993c3aed8417ff050bbcb779 100644
index da834424b655d49388926a0472cacb5ecc4d56fd..141c41c05623ab5802ae3e03ee772d310efda3a8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
@@ -147,6 +147,23 @@ public class Warden extends Monster implements VibrationSystem {
@@ -209,7 +209,7 @@ index c3f095236093c436d37c4730f5537d4fbc0ea6c0..d13bc7e913ebe816598f6104f928c90b
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 2b4408d398962fa4feab9eb248540c6d11037a94..8191ca6341bafbdc7a74a42ebcb0615f61e5bbab 100644
index b32fb80be08146d28d437d5db320c56ba05aebc7..c2bd513882ae8716f52ef7540d9fec9bd3f6017e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1195,7 +1195,15 @@ public class PurpurWorldConfig {
@@ -290,7 +290,7 @@ index 2b4408d398962fa4feab9eb248540c6d11037a94..8191ca6341bafbdc7a74a42ebcb0615f
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -2999,7 +3037,15 @@ public class PurpurWorldConfig {
@@ -3001,7 +3039,15 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;